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

pull/250/merge
Victor Julien 13 years ago
parent 34d063adea
commit 0c84a7a2a9

@ -95,10 +95,10 @@ void hexdump(/*Flow *f,*/ const void *buf, size_t len) {
if (n%16 == 1) { if (n%16 == 1) {
/* store address for this line */ /* store address for this line */
#if __WORDSIZE == 64 #if __WORDSIZE == 64
snprintf(addrstr, sizeof(addrstr), "%.4lx", snprintf(addrstr, sizeof(addrstr), "%.4"PRIx64,
((uint64_t)p-(uint64_t)buf) ); ((uint64_t)p-(uint64_t)buf) );
#else #else
snprintf(addrstr, sizeof(addrstr), "%.4x", snprintf(addrstr, sizeof(addrstr), "%.4"PRIx32,
((uint32_t)p-(uint32_t)buf) ); ((uint32_t)p-(uint32_t)buf) );
#endif #endif
} }

@ -505,7 +505,7 @@ static int PayloadTestSig13(void)
tv_diff.tv_sec = tv_end.tv_sec - tv_start.tv_sec; tv_diff.tv_sec = tv_end.tv_sec - tv_start.tv_sec;
tv_diff.tv_usec = tv_end.tv_usec - tv_start.tv_usec; 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; result = 1;

@ -223,7 +223,7 @@ static int CreateFileName(LogTlsFileCtx *log, Packet *p, SSLState *state, char *
snprintf(filename, filenamelen, "%s/%ld.%ld-%d.pem", snprintf(filename, filenamelen, "%s/%ld.%ld-%d.pem",
tls_logfile_base_dir, tls_logfile_base_dir,
p->ts.tv_sec, p->ts.tv_sec,
p->ts.tv_usec, (long int)p->ts.tv_usec,
file_id); file_id);
return 1; return 1;
} }

@ -277,7 +277,7 @@ SC_ATOMIC_EXTERN(unsigned int, engine_stage);
* _mm_free. * _mm_free.
*/ */
#define SCFreeAligned(a) ({ \ #define SCFreeAligned(a) ({ \
free((a)); \ _mm_free((a)); \
}) })
#endif /* __WIN32 */ #endif /* __WIN32 */

Loading…
Cancel
Save