From: Victor Julien <victor@inliniac.net>
Date: Wed, 4 Apr 2018 10:43:17 +0000 (+0200)
Subject: mingw: minor compile warning fixes
X-Git-Tag: suricata-4.1.0-rc1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=49b02f8f1b44078daadc85719022f87fed47a7b0;p=thirdparty%2Fsuricata.git

mingw: minor compile warning fixes
---

diff --git a/src/conf.c b/src/conf.c
index eae52161fd..64b00ebc3a 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -998,10 +998,11 @@ static int ConfTestSetAndGet(void)
 {
     char name[] = "some-name";
     char value[] = "some-value";
-    const char *value0;
+    const char *value0 = NULL;
 
     FAIL_IF(ConfSet(name, value) != 1);
     FAIL_IF(ConfGet(name, &value0) != 1);
+    FAIL_IF(value0 == NULL);
     FAIL_IF(strcmp(value, value0) != 0);
 
     /* Cleanup. */
@@ -1019,12 +1020,13 @@ static int ConfTestOverrideValue1(void)
     char name[] = "some-name";
     char value0[] = "some-value";
     char value1[] = "new-value";
-    const char *val;
+    const char *val = NULL;
 
     FAIL_IF(ConfSet(name, value0) != 1);
     FAIL_IF(ConfSet(name, value1) != 1);
     FAIL_IF(ConfGet(name, &val) != 1);
-    FAIL_IF(strcmp(val, value1));
+    FAIL_IF(val == NULL);
+    FAIL_IF(strcmp(val, value1) != 0);
 
     /* Cleanup. */
     ConfRemove(name);
@@ -1040,12 +1042,13 @@ static int ConfTestOverrideValue2(void)
     char name[] = "some-name";
     char value0[] = "some-value";
     char value1[] = "new-value";
-    const char *val;
+    const char *val = NULL;
 
     FAIL_IF(ConfSetFinal(name, value0) != 1);
     FAIL_IF(ConfSet(name, value1) != 0);
     FAIL_IF(ConfGet(name, &val) != 1);
-    FAIL_IF(strcmp(val, value0));
+    FAIL_IF(val == NULL);
+    FAIL_IF(strcmp(val, value0) != 0);
 
     /* Cleanup. */
     ConfRemove(name);
diff --git a/src/detect-app-layer-event.c b/src/detect-app-layer-event.c
index 107ee63ab2..1cb3dbd7fd 100644
--- a/src/detect-app-layer-event.c
+++ b/src/detect-app-layer-event.c
@@ -814,18 +814,13 @@ static int DetectAppLayerEventTest06(void)
 
     FAIL_IF_NULL(aled);
 
-    if (DetectAppLayerEventParseAppP2(aled, ipproto_bitarray, &event_type) < 0)
-        goto error;
+    FAIL_IF(DetectAppLayerEventParseAppP2(aled, ipproto_bitarray, &event_type) < 0);
 
-    if (aled->alproto != ALPROTO_UNKNOWN || aled->event_id != DET_CTX_EVENT_TEST)
-        goto error;
+    FAIL_IF(aled->alproto != ALPROTO_UNKNOWN);
+    FAIL_IF(aled->event_id != DET_CTX_EVENT_TEST);
 
     DetectAppLayerEventFree(aled);
     PASS;
-
-error:
-    DetectAppLayerEventFree(aled);
-    FAIL;
 }
 #endif /* UNITTESTS */
 
diff --git a/src/detect-engine-address.c b/src/detect-engine-address.c
index 4394973502..a11e7f40d9 100644
--- a/src/detect-engine-address.c
+++ b/src/detect-engine-address.c
@@ -4740,7 +4740,7 @@ static int AddressTestCutIPv410(void)
     if (b->ip.addr_data32[0] != SCNtohl(16909059) || b->ip2.addr_data32[0] != SCNtohl(16909065))
         goto error;
 
-    printf("ip %u ip2 %u ", htonl(a->ip.addr_data32[0]), htonl(a->ip2.addr_data32[0]));
+    printf("ip %u ip2 %u ", (uint32_t)htonl(a->ip.addr_data32[0]), (uint32_t)htonl(a->ip2.addr_data32[0]));
 
     DetectAddressFree(a);
     DetectAddressFree(b);
diff --git a/src/output-json.c b/src/output-json.c
index 563f67c7f1..c217ae3985 100644
--- a/src/output-json.c
+++ b/src/output-json.c
@@ -748,7 +748,9 @@ OutputInitResult OutputJsonInitCtx(ConfNode *conf)
                 return result;
             }
             OutputRegisterFileRotationFlag(&json_ctx->file_ctx->rotation_flag);
-        } else if (json_ctx->json_out == LOGFILE_TYPE_SYSLOG) {
+        }
+#ifndef OS_WIN32
+	else if (json_ctx->json_out == LOGFILE_TYPE_SYSLOG) {
             const char *facility_s = ConfNodeLookupChildValue(conf, "facility");
             if (facility_s == NULL) {
                 facility_s = DEFAULT_ALERT_SYSLOG_FACILITY_STR;
@@ -775,8 +777,8 @@ OutputInitResult OutputJsonInitCtx(ConfNode *conf)
              * figure it out by itself. */
 
             openlog(ident, LOG_PID|LOG_NDELAY, facility);
-
         }
+#endif
 #ifdef HAVE_LIBHIREDIS
         else if (json_ctx->json_out == LOGFILE_TYPE_REDIS) {
             ConfNode *redis_node = ConfNodeLookupChild(conf, "redis");
diff --git a/src/suricata-common.h b/src/suricata-common.h
index 1a495000bc..03f769dd5c 100644
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -208,6 +208,15 @@
 #endif
 #endif
 
+#if !__CYGWIN__
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#endif /* !__CYGWIN__ */
+
 #ifdef HAVE_WINDOWS_H
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0501
@@ -223,15 +232,6 @@
 #include <w32api/wtypes.h>
 #endif
 
-#if !__CYGWIN__
-#ifdef HAVE_WINSOCK2_H
-#include <winsock2.h>
-#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-#endif /* !__CYGWIN__ */
-
 #ifdef HAVE_LIBJANSSON
 #include <jansson.h>
 #ifndef JSON_ESCAPE_SLASH