Skip to content

Commit 995c5d9

Browse files
committed
rules.c: Simplify the latest bugfix to stacked rules
Just drop a couple of redundant log_event and move the last one so it covers all three See #5722
1 parent f07854d commit 995c5d9

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/rules.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1855,28 +1855,22 @@ char *rules_process_stack_all(char *key, rule_stack *ctx)
18551855
if (!ctx->rule) {
18561856
ctx->rule = ctx->stack_rule->head;
18571857
rules_stacked_number = 0;
1858-
if (!stack_rules_mute)
1859-
log_event("+ Stacked Rule #%u: '%.100s' accepted",
1860-
rules_stacked_number + 1, ctx->rule->data);
18611858
} else {
18621859
if ((ctx->rule = ctx->rule->next)) {
18631860
rules_stacked_number++;
1864-
if (!stack_rules_mute)
1865-
log_event("+ Stacked Rule #%u: '%.100s' accepted",
1866-
rules_stacked_number + 1, ctx->rule->data);
18671861
}
18681862
}
18691863

18701864
rules_stacked_after = 0;
18711865

18721866
while (ctx->rule) {
1867+
if (!stack_rules_mute)
1868+
log_event("+ Stacked Rule #%u: '%.100s' accepted",
1869+
rules_stacked_number + 1, ctx->rule->data);
18731870
if ((word = rules_apply(key, ctx->rule->data, -1)))
18741871
return word;
18751872
if ((ctx->rule = ctx->rule->next)) {
18761873
rules_stacked_number++;
1877-
if (!stack_rules_mute)
1878-
log_event("+ Stacked Rule #%u: '%.100s' accepted",
1879-
rules_stacked_number + 1, ctx->rule->data);
18801874
}
18811875
}
18821876

0 commit comments

Comments
 (0)