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

Cleanups related to PDict -> std::map replacements

Browse source
This commit is contained in:
Jon Siwek 2019-08-13 19:54:42 -07:00
parent e6558d1f19
commit 87f85ecca1
18 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/file_analysis/Manager.cc
View file

@ -33,7 +33,7 @@ Manager::~Manager()
for ( MIMEMap::iterator i = mime_types.begin(); i != mime_types.end(); i++ )
delete i->second;
// Have to assume that too much of Bro has been shutdown by this point
// Have to assume that too much of Zeek has been shutdown by this point
// to do anything more than reclaim memory.
for ( const auto& entry : id_map )
delete entry.second;
@ -58,6 +58,8 @@ void Manager::InitMagic()
void Manager::Terminate()
{
vector<string> keys;
keys.reserve(id_map.size());
for ( const auto& entry : id_map )
keys.push_back(entry.first);
@ -406,8 +408,8 @@ bool Manager::RemoveFile(const string& file_id)
f->EndOfFile();
delete f;
id_map.erase(file_id);
id_map.erase(file_id);
ignored.erase(file_id);
return true;
}