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

Improve Reporter weird-sampling-whitelist getters/setters

Browse source 
- getter methods return const-ref
- setter methods pass by value and std::move()
- ranged-for loops over the whitelists access by const-ref
This commit is contained in:
Jon Siwek 2020-09-08 18:04:54 -07:00
parent 260895fcb1
commit e37baf09c0
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Reporter.h
View file

@ -175,7 +175,7 @@ public:
/** /**
* Gets the weird sampling whitelist. * Gets the weird sampling whitelist.
*/ */
WeirdSet GetWeirdSamplingWhitelist() const const WeirdSet& GetWeirdSamplingWhitelist() const
{ {
return weird_sampling_whitelist; return weird_sampling_whitelist;
} }
@ -185,15 +185,15 @@ public:
* *
* @param weird_sampling_whitelist New weird sampling whitelist. * @param weird_sampling_whitelist New weird sampling whitelist.
*/ */
void SetWeirdSamplingWhitelist(const WeirdSet& weird_sampling_whitelist) void SetWeirdSamplingWhitelist(WeirdSet weird_sampling_whitelist)
{ {
this->weird_sampling_whitelist = weird_sampling_whitelist; this->weird_sampling_whitelist = std::move(weird_sampling_whitelist);
} }
/** /**
* Gets the weird sampling global list. * Gets the weird sampling global list.
*/ */
WeirdSet GetWeirdSamplingGlobalList() const const WeirdSet& GetWeirdSamplingGlobalList() const
{ {
return weird_sampling_global_list; return weird_sampling_global_list;
} }
@ -203,9 +203,9 @@ public:
* *
* @param weird_sampling_global list New weird sampling global list. * @param weird_sampling_global list New weird sampling global list.
*/ */
void SetWeirdSamplingGlobalList(const WeirdSet& weird_sampling_global_list) void SetWeirdSamplingGlobalList(WeirdSet weird_sampling_global_list)
{ {
this->weird_sampling_global_list = weird_sampling_global_list; this->weird_sampling_global_list = std::move(weird_sampling_global_list);
} }
/** /**

8
src/reporter.bif
View file

@ -164,7 +164,7 @@ function Reporter::file_weird%(name: string, f: fa_file, addl: string &default="
function Reporter::get_weird_sampling_whitelist%(%): string_set function Reporter::get_weird_sampling_whitelist%(%): string_set
%{ %{
auto set = zeek::make_intrusive<zeek::TableVal>(zeek::id::string_set); auto set = zeek::make_intrusive<zeek::TableVal>(zeek::id::string_set);
for ( auto el : reporter->GetWeirdSamplingWhitelist() ) for ( const auto& el : reporter->GetWeirdSamplingWhitelist() )
{ {
auto idx = zeek::make_intrusive<zeek::StringVal>(el); auto idx = zeek::make_intrusive<zeek::StringVal>(el);
set->Assign(std::move(idx), nullptr); set->Assign(std::move(idx), nullptr);
@ -194,7 +194,7 @@ function Reporter::set_weird_sampling_whitelist%(weird_sampling_whitelist: strin
whitelist_set.emplace(move(key)); whitelist_set.emplace(move(key));
delete k; delete k;
} }
reporter->SetWeirdSamplingWhitelist(whitelist_set); reporter->SetWeirdSamplingWhitelist(std::move(whitelist_set));
return zeek::val_mgr->True(); return zeek::val_mgr->True();
%} %}
@ -204,7 +204,7 @@ function Reporter::set_weird_sampling_whitelist%(weird_sampling_whitelist: strin
function Reporter::get_weird_sampling_global_list%(%): string_set function Reporter::get_weird_sampling_global_list%(%): string_set
%{ %{
auto set = zeek::make_intrusive<zeek::TableVal>(zeek::id::string_set); auto set = zeek::make_intrusive<zeek::TableVal>(zeek::id::string_set);
for ( auto el : reporter->GetWeirdSamplingGlobalList() ) for ( const auto& el : reporter->GetWeirdSamplingGlobalList() )
{ {
auto idx = zeek::make_intrusive<zeek::StringVal>(el); auto idx = zeek::make_intrusive<zeek::StringVal>(el);
set->Assign(std::move(idx), nullptr); set->Assign(std::move(idx), nullptr);
@ -234,7 +234,7 @@ function Reporter::set_weird_sampling_global_list%(weird_sampling_global_list: s
global_list_set.emplace(move(key)); global_list_set.emplace(move(key));
delete k; delete k;
} }
reporter->SetWeirdSamplingGlobalList(global_list_set); reporter->SetWeirdSamplingGlobalList(std::move(global_list_set));
return zeek::val_mgr->True(); return zeek::val_mgr->True();
%} %}