From 7b8151b693befaebfd01c399479312d7d109709f Mon Sep 17 00:00:00 2001
From: Jeff Lucovsky <jlucovsky@oisf.net>
Date: Fri, 20 Sep 2024 09:57:53 -0400
Subject: [PATCH] misc: Eliminate compiler warnings

Issue: 2290

Fixup the macro usage to eliminate compiler warnings.
---
 src/util-magic.c  | 2 ++
 src/util-memcmp.c | 3 +--
 src/util-spm.c    | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/util-magic.c b/src/util-magic.c
index 63c991cc92d8..17b540015911 100644
--- a/src/util-magic.c
+++ b/src/util-magic.c
@@ -120,11 +120,13 @@ char *MagicThreadLookup(magic_t *ctx, const uint8_t *buf, uint32_t buflen)
 
 #ifdef UNITTESTS
 
+#if 0
 #if defined OS_FREEBSD || defined OS_DARWIN
 #define MICROSOFT_OFFICE_DOC "OLE 2 Compound Document"
 #else
 #define MICROSOFT_OFFICE_DOC "Microsoft Office Document"
 #endif
+#endif
 
 /** \test magic lib calls -- init */
 static int MagicInitTest01(void)
diff --git a/src/util-memcmp.c b/src/util-memcmp.c
index 7113b82dd60c..40f4fd67d63a 100644
--- a/src/util-memcmp.c
+++ b/src/util-memcmp.c
@@ -154,11 +154,10 @@ static int MemcmpTest13 (void)
 
 #include "util-cpu.h"
 
-#define TEST_RUNS 1000000
-
 static int MemcmpTest14 (void)
 {
 #ifdef PROFILING
+#define TEST_RUNS 1000000
     uint64_t ticks_start = 0;
     uint64_t ticks_end = 0;
     const char *a[] = { "0123456789012345", "abc", "abcdefghij", "suricata", "test", "xyz", "rrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr", "abcdefghijklmnopqrstuvwxyz", NULL };
diff --git a/src/util-spm.c b/src/util-spm.c
index 63510596c7a3..dce8c737e1f9 100644
--- a/src/util-spm.c
+++ b/src/util-spm.c
@@ -267,9 +267,6 @@ uint8_t *BoyerMooreNocaseSearch(const uint8_t *text, uint32_t textlen,
  *  #define ENABLE_SEARCH_STATS 1
  */
 
-/* Number of times to repeat the search (for stats) */
-#define STATS_TIMES 1000000
-
 /**
  * \brief Unittest helper function wrappers for the search algorithms
  * \param text pointer to the buffer to search in
@@ -403,6 +400,9 @@ static uint8_t *BoyerMooreNocaseWrapper(uint8_t *text, uint8_t *in_needle, int t
 }
 
 #ifdef ENABLE_SEARCH_STATS
+/* Number of times to repeat the search (for stats) */
+#define STATS_TIMES 1000000
+
 /**
  * \brief Unittest helper function wrappers for the search algorithms
  * \param text pointer to the buffer to search in