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

Base: Clean up explicit uses of namespaces in places where they're not necessary.

Browse source 
This commit covers all of the common and base classes.
This commit is contained in:
Tim Wojtulewicz 2020-08-21 09:29:37 -07:00
parent 9f802b2a4d
commit fe0c22c789
240 changed files with 6823 additions and 6787 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Rule.h
View file

@ -17,14 +17,14 @@ ZEEK_FORWARD_DECLARE_NAMESPACED(Rule, zeek::detail);
namespace zeek::detail {
using rule_list = zeek::PList<Rule>;
using rule_list = PList<Rule>;
using rule_dict = std::map<std::string, Rule*>;
class Rule {
public:
Rule(const char* arg_id, const zeek::detail::Location& arg_location)
Rule(const char* arg_id, const Location& arg_location)
{
id = zeek::util::copy_string(arg_id);
id = util::copy_string(arg_id);
idx = rule_counter++;
location = arg_location;
active = true;
@ -50,7 +50,7 @@ public:
uint32_t offset = 0, uint32_t depth = INT_MAX);
void AddRequires(const char* id, bool opposite_direction, bool negate);
const zeek::detail::Location& GetLocation() const { return location; }
const Location& GetLocation() const { return location; }
void PrintDebug();
@ -61,9 +61,9 @@ private:
void SortHdrTests();
using rule_action_list = zeek::PList<RuleAction>;
using rule_condition_list = zeek::PList<RuleCondition>;
using rule_hdr_test_list = zeek::PList<RuleHdrTest>;
using rule_action_list = PList<RuleAction>;
using rule_condition_list = PList<RuleCondition>;
using rule_hdr_test_list = PList<RuleHdrTest>;
rule_hdr_test_list hdr_tests;
rule_condition_list conditions;
@ -77,7 +77,7 @@ private:
bool negate; // negate test
};
using precond_list = zeek::PList<Precond>;
using precond_list = PList<Precond>;
precond_list preconds;
rule_list dependents; // rules w/ us as a precondition
@ -95,13 +95,13 @@ private:
uint32_t depth;
};
using pattern_list = zeek::PList<Pattern>;
using pattern_list = PList<Pattern>;
pattern_list patterns;
Rule* next; // Linkage within RuleHdrTest tree:
// Ptr to next rule using the same RuleHdrTests
zeek::detail::Location location;
Location location;
// Rules and payloads are numbered individually.
static unsigned int rule_counter;