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

binpac: Move RE_Matcher to zeek namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-07-17 15:18:46 -07:00
parent cd7a2e9783
commit f1d7d0c80d
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tools/binpac/lib/binpac_regex.h
View file

@ -4,7 +4,7 @@
#include "binpac.h" #include "binpac.h"
#include "RE.h" #include "RE.h"
class RE_Matcher; ZEEK_FORWARD_DECLARE_NAMESPACED(RE_Matcher, zeek);
namespace binpac namespace binpac
{ {
@ -17,7 +17,7 @@ namespace binpac
inline void init(FlowBuffer::Policy* fbp = 0); inline void init(FlowBuffer::Policy* fbp = 0);
// Internal vector recording not yet compiled matchers. // Internal vector recording not yet compiled matchers.
extern std::vector<RE_Matcher*>* uncompiled_re_matchers; extern std::vector<zeek::RE_Matcher*>* uncompiled_re_matchers;
class RegExMatcher { class RegExMatcher {
public: public:
@ -25,9 +25,9 @@ public:
: pattern_(pattern) : pattern_(pattern)
{ {
if ( ! uncompiled_re_matchers ) if ( ! uncompiled_re_matchers )
uncompiled_re_matchers = new std::vector<RE_Matcher*>; uncompiled_re_matchers = new std::vector<zeek::RE_Matcher*>;
re_matcher_ = new RE_Matcher(pattern_.c_str()); re_matcher_ = new zeek::RE_Matcher(pattern_.c_str());
uncompiled_re_matchers->push_back(re_matcher_); uncompiled_re_matchers->push_back(re_matcher_);
} }
@ -49,7 +49,7 @@ private:
static void init(); static void init();
string pattern_; string pattern_;
RE_Matcher *re_matcher_; zeek::RE_Matcher *re_matcher_;
}; };
inline void RegExMatcher::init() inline void RegExMatcher::init()