Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 22:58:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move Dictionary/PDict, List/PList, and Queue/PQueue to zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-06-23 13:25:43 -07:00
parent 4a1e17f4e0
commit 464efbe66a
30 changed files with 172 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/file_analysis/AnalyzerSet.h
View file

@ -93,7 +93,7 @@ public:
* @see Dictionary#InitForIteration
* @return an iterator that may be used to loop over analyzers in the set.
*/
IterCookie* InitForIteration() const
zeek::IterCookie* InitForIteration() const
{ return analyzer_map.InitForIteration(); }
/**
@ -103,7 +103,7 @@ public:
* @return the next analyzer in the set or a null pointer if there is no
* more left (in that case the cookie is also deleted).
*/
file_analysis::Analyzer* NextEntry(IterCookie* c)
file_analysis::Analyzer* NextEntry(zeek::IterCookie* c)
{ return analyzer_map.NextEntry(c); }
protected:
@ -145,7 +145,7 @@ private:
File* file; /**< File which owns the set */
CompositeHash* analyzer_hash; /**< AnalyzerArgs hashes. */
PDict<file_analysis::Analyzer> analyzer_map; /**< Indexed by AnalyzerArgs. */
zeek::PDict<file_analysis::Analyzer> analyzer_map; /**< Indexed by AnalyzerArgs. */
/**
* Abstract base class for analyzer set modifications.

8
src/file_analysis/File.cc
View file

@ -394,7 +394,7 @@ void File::DeliverStream(const u_char* data, uint64_t len)
len > 40 ? "..." : "");
file_analysis::Analyzer* a = nullptr;
IterCookie* c = analyzers.InitForIteration();
zeek::IterCookie* c = analyzers.InitForIteration();
while ( (a = analyzers.NextEntry(c)) )
{
@ -498,7 +498,7 @@ void File::DeliverChunk(const u_char* data, uint64_t len, uint64_t offset)
len > 40 ? "..." : "");
file_analysis::Analyzer* a = nullptr;
IterCookie* c = analyzers.InitForIteration();
zeek::IterCookie* c = analyzers.InitForIteration();
while ( (a = analyzers.NextEntry(c)) )
{
@ -562,7 +562,7 @@ void File::EndOfFile()
done = true;
file_analysis::Analyzer* a = nullptr;
IterCookie* c = analyzers.InitForIteration();
zeek::IterCookie* c = analyzers.InitForIteration();
while ( (a = analyzers.NextEntry(c)) )
{
@ -595,7 +595,7 @@ void File::Gap(uint64_t offset, uint64_t len)
}
file_analysis::Analyzer* a = nullptr;
IterCookie* c = analyzers.InitForIteration();
zeek::IterCookie* c = analyzers.InitForIteration();
while ( (a = analyzers.NextEntry(c)) )
{