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

fix a few small rough edges (mostly comments that do no longer apply)

Browse source
This commit is contained in:
Bernhard Amann 2013-05-13 20:40:00 -07:00
parent 8f7619971f
commit 6036872faa
2 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,7 +101,7 @@ bool SQLite::DoInit(const ReaderInfo& info, int arg_num_fields, const threading:
fullpath.c_str(), fullpath.c_str(),
&db, &db,
SQLITE_OPEN_READWRITE | SQLITE_OPEN_READWRITE |
SQLITE_OPEN_FULLMUTEX // perhaps change to nomutex SQLITE_OPEN_NOMUTEX
, ,
NULL)) ) NULL)) )
return false; return false;

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

@ -140,7 +140,7 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields,
&db, &db,
SQLITE_OPEN_READWRITE | SQLITE_OPEN_READWRITE |
SQLITE_OPEN_CREATE | SQLITE_OPEN_CREATE |
SQLITE_OPEN_NOMUTEX // perhaps change to nomutex SQLITE_OPEN_NOMUTEX
, ,
NULL)) ) NULL)) )
return false; return false;
@ -166,8 +166,14 @@ bool SQLite::DoInit(const WriterInfo& info, int arg_num_fields,
sqlite3_free(fieldname); sqlite3_free(fieldname);
string type = GetTableType(field->type, field->subtype); string type = GetTableType(field->type, field->subtype);
if ( type == "" )
{
InternalError(Fmt("Could not determine type for field %lu:%s", i, fieldname));
return false;
}
create += " "+type; create += " "+type;
/* if ( !field->optional ) { /* if ( !field->optional ) {
create += " NOT NULL"; create += " NOT NULL";
} */ } */
@ -287,9 +293,8 @@ int SQLite::AddParams(Value* val, int pos)
if ( ! val->val.string_val.length || val->val.string_val.length == 0 ) if ( ! val->val.string_val.length || val->val.string_val.length == 0 )
return sqlite3_bind_null(st, pos); return sqlite3_bind_null(st, pos);
return sqlite3_bind_text(st, pos, val->val.string_val.data, val->val.string_val.length, SQLITE_TRANSIENT); // FIXME who deletes this return sqlite3_bind_text(st, pos, val->val.string_val.data, val->val.string_val.length, SQLITE_TRANSIENT);
} }
case TYPE_TABLE: case TYPE_TABLE:
{ {
ODesc desc; ODesc desc;
@ -308,9 +313,6 @@ int SQLite::AddParams(Value* val, int pos)
desc.AddRaw(set_separator); desc.AddRaw(set_separator);
io->Describe(&desc, val->val.set_val.vals[j], fields[pos]->name); io->Describe(&desc, val->val.set_val.vals[j], fields[pos]->name);
// yes, giving NULL here is not really really pretty....
// it works however, because tables cannot contain tables...
// or vectors.
} }
desc.RemoveEscapeSequence(set_separator); desc.RemoveEscapeSequence(set_separator);