magic: fix compile warnings

8 years ago · 9b1f74409b
parent 3ff5dc3653
commit 9b1f74409b
2 changed files with 2 additions and 2 deletions
--- a/src/detect-filemagic.c
+++ b/src/detect-filemagic.c
@ -56,7 +56,7 @@

 #ifndef HAVE_MAGIC

-static int DetectFilemagicSetupNoSupport (DetectEngineCtx *de_ctx, Signature *s, char *str)
+static int DetectFilemagicSetupNoSupport (DetectEngineCtx *de_ctx, Signature *s, const char *str)
 {
    SCLogError(SC_ERR_NO_MAGIC_SUPPORT, "no libmagic support built in, needed for filemagic keyword");
    return -1;
--- a/src/util-magic.c
+++ b/src/util-magic.c
@ -29,12 +29,12 @@

 #include "suricata-common.h"

-#ifdef HAVE_MAGIC
 #include "conf.h"

 #include "util-unittest.h"
 #include "util-magic.h"

+#ifdef HAVE_MAGIC
 static magic_t g_magic_ctx = NULL;
 static SCMutex g_magic_lock;