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

iosource/threading/input/logging: Replace nulls with nullptr

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-04-01 16:52:03 -07:00
parent 4ee84b69f2
commit cb01e098df
27 changed files with 154 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/input/readers/sqlite/SQLite.cc
View file

@ -156,7 +156,7 @@ Value* SQLite::EntryToVal(sqlite3_stmt *st, const threading::Field *field, int p
{
Error("Invalid data type for boolean - expected Integer");
delete val;
return 0;
return nullptr;
}
int res = sqlite3_column_int(st, pos);
@ -167,7 +167,7 @@ Value* SQLite::EntryToVal(sqlite3_stmt *st, const threading::Field *field, int p
{
Error(Fmt("Invalid value for boolean: %d", res));
delete val;
return 0;
return nullptr;
}
break;
}
@ -240,7 +240,7 @@ Value* SQLite::EntryToVal(sqlite3_stmt *st, const threading::Field *field, int p
default:
Error(Fmt("unsupported field format %d", field->type));
delete val;
return 0;
return nullptr;
}
return val;
@ -279,7 +279,7 @@ bool SQLite::DoUpdate()
mapping[j] = i;
}
if ( fields[j]->secondary_name != 0 && strcmp(fields[j]->secondary_name, name) == 0 )
if ( fields[j]->secondary_name != nullptr && strcmp(fields[j]->secondary_name, name) == 0 )
{
assert(fields[j]->type == TYPE_PORT);
if ( submapping[j] != -1 )
@ -314,7 +314,7 @@ bool SQLite::DoUpdate()
for ( unsigned int j = 0; j < num_fields; ++j)
{
ofields[j] = EntryToVal(st, fields[j], mapping[j], submapping[j]);
if ( ofields[j] == 0 )
if ( ! ofields[j] )
{
for ( unsigned int k = 0; k < j; ++k )
delete ofields[k];