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

Merge branch 'topic/bernhard/reader-info' into topic/bernhard/sqlite

Browse source 
Now uses optional dbname configuration option

Conflicts:
	scripts/base/frameworks/logging/__load__.bro
	src/logging.bif
This commit is contained in:
Bernhard Amann 2012-07-02 10:13:54 -07:00
commit b8ad4567fb
167 changed files with 5537 additions and 1769 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ public:
{ return new SQLite(frontend); }
protected:
virtual bool DoInit(string path, int num_fields,
virtual bool DoInit(const WriterInfo& info, int num_fields,
const threading::Field* const* fields);
virtual bool DoWrite(int num_fields, const threading::Field* const* fields,
threading::Value** vals);