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

logging: Fix coverity std::move suggestions

Browse source
This commit is contained in:
Arne Welzel 2023-12-04 18:26:53 +01:00
parent 52fba4aacf
commit 30314dd940
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/logging/Manager.cc
View file

@ -159,7 +159,7 @@ const DelayInfoPtr DelayInfo::nil = nullptr;
class LogDelayExpiredTimer : public zeek::detail::Timer { class LogDelayExpiredTimer : public zeek::detail::Timer {
public: public:
LogDelayExpiredTimer(std::function<void(double, bool)> dispatch_callback, double t) LogDelayExpiredTimer(std::function<void(double, bool)> dispatch_callback, double t)
: Timer(t, zeek::detail::TIMER_LOG_DELAY_EXPIRE), dispatch_callback(dispatch_callback) {} : Timer(t, zeek::detail::TIMER_LOG_DELAY_EXPIRE), dispatch_callback(std::move(dispatch_callback)) {}
void Dispatch(double t, bool is_expire) override { dispatch_callback(t, is_expire); } void Dispatch(double t, bool is_expire) override { dispatch_callback(t, is_expire); }
@ -995,7 +995,7 @@ bool Manager::Write(EnumVal* id, RecordVal* columns_arg) {
} }
} // scope for active write. } // scope for active write.
return WriteToFilters(stream, columns, stream_veto ? PolicyVerdict::VETO : PolicyVerdict::PASS); return WriteToFilters(stream, std::move(columns), stream_veto ? PolicyVerdict::VETO : PolicyVerdict::PASS);
} }
bool Manager::WriteToFilters(const Manager::Stream* stream, zeek::RecordValPtr columns, PolicyVerdict stream_verdict) { bool Manager::WriteToFilters(const Manager::Stream* stream, zeek::RecordValPtr columns, PolicyVerdict stream_verdict) {
@ -1119,9 +1119,7 @@ bool Manager::WriteToFilters(const Manager::Stream* stream, zeek::RecordValPtr c
// Rename fields if a field name map is set. // Rename fields if a field name map is set.
if ( filter->field_name_map ) { if ( filter->field_name_map ) {
const char* name = filter->fields[j]->name; const char* name = filter->fields[j]->name;
auto fn = make_intrusive<StringVal>(name); if ( const auto& val = filter->field_name_map->Find(make_intrusive<StringVal>(name)) ) {
if ( const auto& val = filter->field_name_map->Find(fn) ) {
delete[] filter->fields[j]->name; delete[] filter->fields[j]->name;
auto [data, len] = val->AsStringVal()->CheckStringWithSize(); auto [data, len] = val->AsStringVal()->CheckStringWithSize();
filter->fields[j]->name = util::copy_string(data, len); filter->fields[j]->name = util::copy_string(data, len);

4
src/logging/logging.bif
View file

@ -112,7 +112,7 @@ function Log::__delay%(id: Log::ID, rec: any, post_delay_cb: PostDelayCallback%)
if ( post_delay_cb_ptr == empty_post_delay_cb_ptr ) if ( post_delay_cb_ptr == empty_post_delay_cb_ptr )
post_delay_cb_ptr = Func::nil; post_delay_cb_ptr = Func::nil;
return zeek::log_mgr->Delay(idptr, recptr, post_delay_cb_ptr); return zeek::log_mgr->Delay(idptr, std::move(recptr), std::move(post_delay_cb_ptr));
%} %}
function Log::__delay_finish%(id: Log::ID, rec: any, token: Log::DelayToken%): bool function Log::__delay_finish%(id: Log::ID, rec: any, token: Log::DelayToken%): bool
@ -122,7 +122,7 @@ function Log::__delay_finish%(id: Log::ID, rec: any, token: Log::DelayToken%): b
if ( ! idptr || ! recptr ) if ( ! idptr || ! recptr )
return zeek::val_mgr->Bool(false); return zeek::val_mgr->Bool(false);
bool result = zeek::log_mgr->DelayFinish(idptr, recptr, {zeek::NewRef{}, token}); bool result = zeek::log_mgr->DelayFinish(std::move(idptr), std::move(recptr), {zeek::NewRef{}, token});
return zeek::val_mgr->Bool(result); return zeek::val_mgr->Bool(result);
%} %}