From: Victor Julien <vjulien@oisf.net>
Date: Fri, 12 May 2023 12:12:19 +0000 (+0200)
Subject: profiling/rules: simplify return code handling
X-Git-Tag: suricata-7.0.0-rc2~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2423b2a4830034caf04a68aca260b69a5035baf2;p=thirdparty%2Fsuricata.git

profiling/rules: simplify return code handling
---

diff --git a/src/unix-manager.c b/src/unix-manager.c
index cb3645cd90..071bf75a72 100644
--- a/src/unix-manager.c
+++ b/src/unix-manager.c
@@ -798,12 +798,7 @@ static TmEcode UnixManagerRulesetProfileCommand(json_t *cmd, json_t *server_msg,
 static TmEcode UnixManagerRulesetProfileStartCommand(json_t *cmd, json_t *server_msg, void *data)
 {
     SCEnter();
-
-    int ret = SCProfileRuleStartCollection();
-    if (ret != TM_ECODE_OK) {
-        json_object_set_new(server_msg, "message", json_string("NOK"));
-        SCReturnInt(TM_ECODE_FAILED);
-    }
+    SCProfileRuleStartCollection();
     json_object_set_new(server_msg, "message", json_string("OK"));
     SCReturnInt(TM_ECODE_OK);
 }
@@ -811,16 +806,10 @@ static TmEcode UnixManagerRulesetProfileStartCommand(json_t *cmd, json_t *server
 static TmEcode UnixManagerRulesetProfileStopCommand(json_t *cmd, json_t *server_msg, void *data)
 {
     SCEnter();
-
-    int ret = SCProfileRuleStopCollection();
-    if (ret != TM_ECODE_OK) {
-        json_object_set_new(server_msg, "message", json_string("NOK"));
-        SCReturnInt(TM_ECODE_FAILED);
-    }
+    SCProfileRuleStopCollection();
     json_object_set_new(server_msg, "message", json_string("OK"));
     SCReturnInt(TM_ECODE_OK);
 }
-
 #endif
 
 static TmEcode UnixManagerShowFailedRules(json_t *cmd,
diff --git a/src/util-profiling.c b/src/util-profiling.c
index f412f07910..5d4bcc8905 100644
--- a/src/util-profiling.c
+++ b/src/util-profiling.c
@@ -1405,14 +1405,12 @@ SCProfilingRegisterTests(void)
 #endif /* UNITTESTS */
 }
 
-int SCProfileRuleStartCollection(void)
+void SCProfileRuleStartCollection(void)
 {
-    SCReturnInt(TM_ECODE_OK);
 }
 
-int SCProfileRuleStopCollection(void)
+void SCProfileRuleStopCollection(void)
 {
-    SCReturnInt(TM_ECODE_OK);
 }
 
 #elif PROFILE_RULES
@@ -1466,16 +1464,14 @@ int SCProfileRuleStart(Packet *p)
     return 0;
 }
 
-int SCProfileRuleStartCollection(void)
+void SCProfileRuleStartCollection(void)
 {
     SC_ATOMIC_SET(profiling_rules_active, true);
-    SCReturnInt(TM_ECODE_OK);
 }
 
-int SCProfileRuleStopCollection(void)
+void SCProfileRuleStopCollection(void)
 {
     SC_ATOMIC_SET(profiling_rules_active, false);
-    SCReturnInt(TM_ECODE_OK);
 }
 
 #endif /* PROFILING */
diff --git a/src/util-profiling.h b/src/util-profiling.h
index c53b25b2a1..647ad7b4cc 100644
--- a/src/util-profiling.h
+++ b/src/util-profiling.h
@@ -401,8 +401,8 @@ void SCProfilingRuleThreadSetup(struct SCProfileDetectCtx_ *, DetectEngineThread
 void SCProfilingRuleThreadCleanup(DetectEngineThreadCtx *);
 int SCProfileRuleStart(Packet *p);
 json_t *SCProfileRuleTriggerDump(DetectEngineCtx *de_ctx);
-int SCProfileRuleStartCollection(void);
-int SCProfileRuleStopCollection(void);
+void SCProfileRuleStartCollection(void);
+void SCProfileRuleStopCollection(void);
 void SCProfilingRuleThreatAggregate(DetectEngineThreadCtx *det_ctx);
 
 #define RULE_PROFILING_START(p)                                                                    \