Use _mm_free for memory allocated by _mm_alloc. Bug 703. Minor compiler warning fixes.

diff --git a/src/app-layer-dcerpc.c b/src/app-layer-dcerpc.c
index 79b64cbcd85a7d54f3000456247bbe65e4c7aff7..48b5bd2944abe28f90ad9733ad3b6bab4d770b03 100644 (file)
--- a/src/app-layer-dcerpc.c
+++ b/src/app-layer-dcerpc.c
@@ -95,10 +95,10 @@ void hexdump(/*Flow *f,*/ const void *buf, size_t len) {
         if (n%16 == 1) {
             /* store address for this line */
 #if __WORDSIZE == 64
-            snprintf(addrstr, sizeof(addrstr), "%.4lx",
+            snprintf(addrstr, sizeof(addrstr), "%.4"PRIx64,
             ((uint64_t)p-(uint64_t)buf) );
 #else
-            snprintf(addrstr, sizeof(addrstr), "%.4x",
+            snprintf(addrstr, sizeof(addrstr), "%.4"PRIx32,
             ((uint32_t)p-(uint32_t)buf) );
 #endif
         }

diff --git a/src/detect-engine-payload.c b/src/detect-engine-payload.c
index 7d7306973faab9ff7d926ee1791a399231f7049b..64dfe736595bc1daacb0f7e32f8150425640941e 100644 (file)
--- a/src/detect-engine-payload.c
+++ b/src/detect-engine-payload.c
@@ -505,7 +505,7 @@ static int PayloadTestSig13(void)
     tv_diff.tv_sec = tv_end.tv_sec - tv_start.tv_sec;
     tv_diff.tv_usec = tv_end.tv_usec - tv_start.tv_usec;
 
-    printf("%ld.%06ld\n", tv_diff.tv_sec, tv_diff.tv_usec);
+    printf("%ld.%06ld\n", tv_diff.tv_sec, (long int)tv_diff.tv_usec);
 
     result = 1;
 

diff --git a/src/log-tlslog.c b/src/log-tlslog.c
index a5c4602a1dacf52e0c52a116386a3155488ac7f1..cda08b85b7526f19b15e036abf5db4a406aa969b 100644 (file)
--- a/src/log-tlslog.c
+++ b/src/log-tlslog.c
@@ -223,7 +223,7 @@ static int CreateFileName(LogTlsFileCtx *log, Packet *p, SSLState *state, char *
     snprintf(filename, filenamelen, "%s/%ld.%ld-%d.pem",
              tls_logfile_base_dir,
              p->ts.tv_sec,
-             p->ts.tv_usec,
+             (long int)p->ts.tv_usec,
              file_id);
     return 1;
 }

diff --git a/src/util-mem.h b/src/util-mem.h
index 2bcf0ed5d7176713850758a32ddf7ed0d5c40ce9..61c0328fabfce5919ed1ef04319a2a3360be74f4 100644 (file)
--- a/src/util-mem.h
+++ b/src/util-mem.h
@@ -277,7 +277,7 @@ SC_ATOMIC_EXTERN(unsigned int, engine_stage);
  * _mm_free.
  */
 #define SCFreeAligned(a) ({ \
-    free((a)); \
+    _mm_free((a)); \
 })
 
 #endif /* __WIN32 */