From: Victor Julien <vjulien@oisf.net>
Date: Fri, 12 May 2023 12:09:10 +0000 (+0200)
Subject: profiling/rules: minor code cleanup
X-Git-Tag: suricata-7.0.0-rc2~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=835eaf7ccdb4ecc65c0fe50e74d3a6d9dead9fc7;p=thirdparty%2Fsuricata.git

profiling/rules: minor code cleanup
---

diff --git a/src/util-profiling-rules.c b/src/util-profiling-rules.c
index ded04c33ce..90c1b8e57f 100644
--- a/src/util-profiling-rules.c
+++ b/src/util-profiling-rules.c
@@ -600,14 +600,13 @@ void SCProfilingRuleThreadSetup(SCProfileDetectCtx *ctx, DetectEngineThreadCtx *
 }
 
 static void SCProfilingRuleThreadMerge(
-        DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, int reset)
+        DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, bool reset)
 {
     if (de_ctx == NULL || de_ctx->profile_ctx == NULL || de_ctx->profile_ctx->data == NULL ||
             det_ctx == NULL || det_ctx->rule_perf_data == NULL)
         return;
 
-    int i;
-    for (i = 0; i < det_ctx->rule_perf_data_size; i++) {
+    for (int i = 0; i < det_ctx->rule_perf_data_size; i++) {
         de_ctx->profile_ctx->data[i].checks += det_ctx->rule_perf_data[i].checks;
         de_ctx->profile_ctx->data[i].matches += det_ctx->rule_perf_data[i].matches;
         de_ctx->profile_ctx->data[i].ticks_match += det_ctx->rule_perf_data[i].ticks_match;
@@ -629,7 +628,7 @@ void SCProfilingRuleThreadCleanup(DetectEngineThreadCtx *det_ctx)
         return;
 
     pthread_mutex_lock(&det_ctx->de_ctx->profile_ctx->data_m);
-    SCProfilingRuleThreadMerge(det_ctx->de_ctx, det_ctx, 0);
+    SCProfilingRuleThreadMerge(det_ctx->de_ctx, det_ctx, false);
     pthread_mutex_unlock(&det_ctx->de_ctx->profile_ctx->data_m);
 
     SCFree(det_ctx->rule_perf_data);
@@ -643,7 +642,7 @@ void SCProfilingRuleThreatAggregate(DetectEngineThreadCtx *det_ctx)
     if (det_ctx == NULL || det_ctx->de_ctx == NULL || det_ctx->de_ctx->profile_ctx == NULL)
         return;
     pthread_mutex_lock(&det_ctx->de_ctx->profile_ctx->data_m);
-    SCProfilingRuleThreadMerge(det_ctx->de_ctx, det_ctx, 1);
+    SCProfilingRuleThreadMerge(det_ctx->de_ctx, det_ctx, true);
     pthread_mutex_unlock(&det_ctx->de_ctx->profile_ctx->data_m);
 }