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

Base: Clean up explicit uses of namespaces in places where they're not necessary.

Browse source 
This commit covers all of the common and base classes.
This commit is contained in:
Tim Wojtulewicz 2020-08-21 09:29:37 -07:00
parent 9f802b2a4d
commit fe0c22c789
240 changed files with 6823 additions and 6787 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/logging/WriterBackend.cc
View file

@ -22,7 +22,7 @@ public:
RotationFinishedMessage(WriterFrontend* writer, const char* new_name, const char* old_name,
double open, double close, bool success, bool terminating)
: threading::OutputMessage<WriterFrontend>("RotationFinished", writer),
new_name(zeek::util::copy_string(new_name)), old_name(zeek::util::copy_string(old_name)), open(open),
new_name(util::copy_string(new_name)), old_name(util::copy_string(old_name)), open(open),
close(close), success(success), terminating(terminating) { }
~RotationFinishedMessage() override
@ -97,8 +97,8 @@ bool WriterBackend::WriterInfo::FromBroker(broker::data d)
if ( ! (bpath && brotation_base && brotation_interval && bnetwork_time && bconfig && bppf) )
return false;
path = zeek::util::copy_string(bpath->c_str());
post_proc_func = zeek::util::copy_string(bppf->c_str());
path = util::copy_string(bpath->c_str());
post_proc_func = util::copy_string(bppf->c_str());
rotation_base = *brotation_base;
rotation_interval = *brotation_interval;
network_time = *bnetwork_time;
@ -111,7 +111,7 @@ bool WriterBackend::WriterInfo::FromBroker(broker::data d)
if ( ! (k && v) )
return false;
auto p = std::make_pair(zeek::util::copy_string(k->c_str()), zeek::util::copy_string(v->c_str()));
auto p = std::make_pair(util::copy_string(k->c_str()), util::copy_string(v->c_str()));
config.insert(p);
}
@ -205,7 +205,7 @@ bool WriterBackend::Write(int arg_num_fields, int num_writes, Value*** vals)
#ifdef DEBUG
const char* msg = Fmt("Number of fields don't match in WriterBackend::Write() (%d vs. %d)",
arg_num_fields, num_fields);
Debug(zeek::DBG_LOGGING, msg);
Debug(DBG_LOGGING, msg);
#endif
DeleteVals(num_writes, vals);
@ -223,7 +223,7 @@ bool WriterBackend::Write(int arg_num_fields, int num_writes, Value*** vals)
#ifdef DEBUG
const char* msg = Fmt("Field #%d type doesn't match in WriterBackend::Write() (%d vs. %d)",
i, vals[j][i]->type, fields[i]->type);
Debug(zeek::DBG_LOGGING, msg);
Debug(DBG_LOGGING, msg);
#endif
DisableFrontend();
DeleteVals(num_writes, vals);