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

The Great Embooleanating

Browse source 
A large number of functions had return values and/or arguments changed
to use ``bool`` types instead of ``int``.
This commit is contained in:
Tim Wojtulewicz 2020-03-11 10:41:46 -07:00 • committed by Robin Sommer
parent 3c470ffe13
commit fd5e15b116
145 changed files with 1288 additions and 1331 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/RuleMatcher.cc
View file

@ -758,8 +758,8 @@ RuleEndpointState* RuleMatcher::InitEndpoint(analyzer::Analyzer* analyzer,
// Evaluate all rules on this node which don't contain
// any patterns.
for ( Rule* r = hdr_test->pure_rules; r; r = r->next )
if ( EvalRuleConditions(r, state, 0, 0, 0) )
ExecRuleActions(r, state, 0, 0, 0);
if ( EvalRuleConditions(r, state, 0, 0, false) )
ExecRuleActions(r, state, 0, 0, false);
// If we're on or above the RE_level, we may have some
// pattern matching to do.
@ -953,17 +953,17 @@ void RuleMatcher::Match(RuleEndpointState* state, Rule::PatternType type,
if ( ! state->matched_by_patterns.is_member(r) )
{
state->matched_by_patterns.push_back(r);
BroString* s = new BroString(data, data_len, 0);
BroString* s = new BroString(data, data_len, false);
state->matched_text.push_back(s);
}
DBG_LOG(DBG_RULES, "And has not already fired");
// Eval additional conditions.
if ( ! EvalRuleConditions(r, state, data, data_len, 0) )
if ( ! EvalRuleConditions(r, state, data, data_len, false) )
continue;
// Found a match.
ExecRuleActions(r, state, data, data_len, 0);
ExecRuleActions(r, state, data, data_len, false);
}
}
}
@ -977,11 +977,11 @@ void RuleMatcher::FinishEndpoint(RuleEndpointState* state)
// although they have not matched at the beginning. So, we have
// to test the candidates here.
ExecPureRules(state, 1);
ExecPureRules(state, true);
loop_over_list(state->matched_by_patterns, i)
ExecRulePurely(state->matched_by_patterns[i],
state->matched_text[i], state, 1);
state->matched_text[i], state, true);
}
void RuleMatcher::ExecPureRules(RuleEndpointState* state, bool eos)
@ -1115,7 +1115,7 @@ void RuleMatcher::ExecRule(Rule* rule, RuleEndpointState* state, bool eos)
void RuleMatcher::ClearEndpointState(RuleEndpointState* state)
{
ExecPureRules(state, 1);
ExecPureRules(state, true);
state->payload_size = -1;