[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Tomasz Kojm]

The following commit has been merged in the debian/unstable branch:
commit f032fb29f0806ab98710c1bd45a3ca84c466a485
Author: Tomasz Kojm <tkojm at clamav.net>
Date:   Wed Dec 2 23:17:59 2009 +0100

    libclamav/qsort.c: fix CMP1 macro (bb#1769)

diff --git a/ChangeLog b/ChangeLog
index d35c9c5..52916b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec  2 23:17:27 CET 2009 (tk)
+---------------------------------
+ * libclamav/qsort.c: fix CMP1 macro (bb#1769)
+
 Tue Dec  1 23:17:53 CET 2009 (tk)
 ---------------------------------
  * libclamav/readdb.c: make sure static sigs with floating chars go into AC
diff --git a/libclamav/qsort.c b/libclamav/qsort.c
index 248995e..31cbfa7 100644
--- a/libclamav/qsort.c
+++ b/libclamav/qsort.c
@@ -76,9 +76,9 @@ swapfunc(a, b, n, swaptype)
 
 #define vecswap(a, b, n) 	if ((n) > 0) swapfunc(a, b, n, swaptype)
 
-#define CMP1(a, b) ((int)(*(const uint32_t *)a - *(const uint32_t *)b))
+#define CMP1(a, b) ((int)(*((uint32_t *)a) - *((uint32_t *)b)))
 #define CMP(a, b)   (cmp ? (cmp(a, b)) : CMP1(a, b))
-#define MED3(a, b, c, d)   (d ? (med3(a, b, c, d)) : (CMP1(a, b) < 0 ? (CMP1(b, c) < 0 ? b : (CMP1(a, c) < 0 ? c : a )) : (CMP1(b, c) > 0 ? b : (CMP1(a, c) < 0 ? a : c ))))
+#define MED3(a, b, c, d)   (d ? (med3(a, b, c, d)) : (CMP1(a, b) < 0 ? (CMP1(b, c) < 0 ? (b) : (CMP1(a, c) < 0 ? (c) : (a))) : (CMP1(b, c) > 0 ? (b) : (CMP1(a, c) < 0 ? (a) : (c)))))
 
 static inline char *
 med3(a, b, c, cmp)

-- 
Debian repository for ClamAV