From: Victor Julien <victor@inliniac.net>
Date: Sat, 6 May 2017 08:49:43 +0000 (+0200)
Subject: magic: fix compile warnings
X-Git-Tag: suricata-4.0.0-beta1~103
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1f74409bcb88e3801aa26bb1520bb728d49d0c;p=thirdparty%2Fsuricata.git

magic: fix compile warnings
---

diff --git a/src/detect-filemagic.c b/src/detect-filemagic.c
index 0cdad2c77d..8145add23b 100644
--- 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;
diff --git a/src/util-magic.c b/src/util-magic.c
index a25e13bc47..9e1179747c 100644
--- 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;