Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-08 09:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixing compile problems with some versions of libc++.

Browse source 
Reported by Craig Leres.
This commit is contained in:
Robin Sommer 2014-01-13 09:16:51 -08:00
parent 62527f6430
commit 69ef268a44
5 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -1,4 +1,9 @@
2.2-93 | 2014-01-13 09:16:51 -0800
* Fixing compile problems with some versions of libc++. Reported by
Craig Leres. (Robin Sommer)
2.2-91 | 2014-01-13 01:33:28 -0800 2.2-91 | 2014-01-13 01:33:28 -0800
* Improve GeoIP City database support. When trying to open a city * Improve GeoIP City database support. When trying to open a city

2
VERSION
View file

@ -1 +1 @@
2.2-91 2.2-93

2
src/input/readers/Raw.cc
View file

@ -365,7 +365,7 @@ bool Raw::DoInit(const ReaderInfo& info, int num_fields, const Field* const* fie
fname = source.substr(0, fname.length() - 1); fname = source.substr(0, fname.length() - 1);
} }
map<const char*, const char*>::const_iterator it = info.config.find("stdin"); // data that is sent to the child process ReaderInfo::config_map::const_iterator it = info.config.find("stdin"); // data that is sent to the child process
if ( it != info.config.end() ) if ( it != info.config.end() )
{ {
stdin_string = it->second; stdin_string = it->second;

2
src/input/readers/SQLite.cc
View file

@ -85,7 +85,7 @@ bool SQLite::DoInit(const ReaderInfo& info, int arg_num_fields, const threading:
fullpath.append(".sqlite"); fullpath.append(".sqlite");
string query; string query;
map<const char*, const char*>::const_iterator it = info.config.find("query"); ReaderInfo::config_map::const_iterator it = info.config.find("query");
if ( it == info.config.end() ) if ( it == info.config.end() )
{ {
Error(Fmt("No query specified when setting up SQLite data source. Aborting.", info.source)); Error(Fmt("No query specified when setting up SQLite data source. Aborting.", info.source));

2
src/logging/writers/SQLite.cc
View file

@ -126,7 +126,7 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields,
fullpath.append(".sqlite"); fullpath.append(".sqlite");
string tablename; string tablename;
map<const char*, const char*>::const_iterator it = info.config.find("tablename"); WriterInfo::config_map::const_iterator it = info.config.find("tablename");
if ( it == info.config.end() ) if ( it == info.config.end() )
{ {
MsgThread::Info(Fmt("tablename configuration option not found. Defaulting to path %s", info.path)); MsgThread::Info(Fmt("tablename configuration option not found. Defaulting to path %s", info.path));