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

Use ranged-for loops in a few places in iosource Manager

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-02-01 19:37:31 -07:00
parent d12d0332a7
commit efaa756539
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/iosource/Manager.cc
View file

@ -255,11 +255,11 @@ void Manager::Register(IOSource* src, bool dont_count)
{ {
// First see if we already have registered that source. If so, just // First see if we already have registered that source. If so, just
// adjust dont_count. // adjust dont_count.
for ( SourceList::iterator i = sources.begin(); i != sources.end(); ++i ) for ( const auto& iosrc : sources )
{ {
if ( (*i)->src == src ) if ( iosrc->src == src )
{ {
if ( (*i)->dont_count != dont_count ) if ( iosrc->dont_count != dont_count )
// Adjust the global counter. // Adjust the global counter.
dont_counts += (dont_count ? 1 : -1); dont_counts += (dont_count ? 1 : -1);
@ -323,12 +323,8 @@ PktSrc* Manager::OpenPktSrc(const std::string& path, bool is_live)
PktSrcComponent* component = 0; PktSrcComponent* component = 0;
std::list<PktSrcComponent*> all_components = plugin_mgr->Components<PktSrcComponent>(); std::list<PktSrcComponent*> all_components = plugin_mgr->Components<PktSrcComponent>();
for ( const auto& c : all_components )
for ( std::list<PktSrcComponent*>::const_iterator i = all_components.begin();
i != all_components.end(); i++ )
{ {
PktSrcComponent* c = *i;
if ( c->HandlesPrefix(prefix) && if ( c->HandlesPrefix(prefix) &&
(( is_live && c->DoesLive() ) || (( is_live && c->DoesLive() ) ||
(! is_live && c->DoesTrace())) ) (! is_live && c->DoesTrace())) )
@ -369,13 +365,11 @@ PktDumper* Manager::OpenPktDumper(const string& path, bool append)
PktDumperComponent* component = 0; PktDumperComponent* component = 0;
std::list<PktDumperComponent*> all_components = plugin_mgr->Components<PktDumperComponent>(); std::list<PktDumperComponent*> all_components = plugin_mgr->Components<PktDumperComponent>();
for ( const auto& c : all_components )
for ( std::list<PktDumperComponent*>::const_iterator i = all_components.begin();
i != all_components.end(); i++ )
{ {
if ( (*i)->HandlesPrefix(prefix) ) if ( c->HandlesPrefix(prefix) )
{ {
component = (*i); component = c;
break; break;
} }
} }