mirror of
https://github.com/zeek/zeek.git
synced 2025-10-06 08:38:20 +00:00
Replace uses of the old List generation code with new template versions
This commit is contained in:
parent
29836b47d0
commit
237c7e4e15
17 changed files with 57 additions and 94 deletions
20
src/Rule.h
20
src/Rule.h
|
@ -14,8 +14,7 @@ class RuleHdrTest;
|
|||
|
||||
class Rule;
|
||||
|
||||
declare(PList, Rule);
|
||||
typedef PList(Rule) rule_list;
|
||||
typedef PList<Rule> rule_list;
|
||||
|
||||
declare(PDict, Rule);
|
||||
typedef PDict(Rule) rule_dict;
|
||||
|
@ -61,14 +60,9 @@ private:
|
|||
|
||||
void SortHdrTests();
|
||||
|
||||
declare(PList, RuleAction);
|
||||
typedef PList(RuleAction) rule_action_list;
|
||||
|
||||
declare(PList, RuleCondition);
|
||||
typedef PList(RuleCondition) rule_condition_list;
|
||||
|
||||
declare(PList, RuleHdrTest);
|
||||
typedef PList(RuleHdrTest) rule_hdr_test_list;
|
||||
typedef PList<RuleAction> rule_action_list;
|
||||
typedef PList<RuleCondition> rule_condition_list;
|
||||
typedef PList<RuleHdrTest> rule_hdr_test_list;
|
||||
|
||||
rule_hdr_test_list hdr_tests;
|
||||
rule_condition_list conditions;
|
||||
|
@ -82,8 +76,7 @@ private:
|
|||
bool negate; // negate test
|
||||
};
|
||||
|
||||
declare(PList, Precond);
|
||||
typedef PList(Precond) precond_list;
|
||||
typedef PList<Precond> precond_list;
|
||||
|
||||
precond_list preconds;
|
||||
rule_list dependents; // rules w/ us as a precondition
|
||||
|
@ -101,8 +94,7 @@ private:
|
|||
uint32 depth;
|
||||
};
|
||||
|
||||
declare(PList, Pattern);
|
||||
typedef PList(Pattern) pattern_list;
|
||||
typedef PList<Pattern> pattern_list;
|
||||
pattern_list patterns;
|
||||
|
||||
Rule* next; // Linkage within RuleHdrTest tree:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue