[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b
Tomasz Kojm
tkojm at clamav.net
Sun Apr 4 01:09:15 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit 15ae50177a9acf0ce6dacaf2ceac38af15c2764c
Author: Tomasz Kojm <tkojm at clamav.net>
Date: Mon Nov 16 20:08:28 2009 +0100
fix some compile warnings
diff --git a/libclamav/qsort.c b/libclamav/qsort.c
index a0be897..3fcf27d 100644
--- a/libclamav/qsort.c
+++ b/libclamav/qsort.c
@@ -93,16 +93,16 @@ void cli_qsort(void *a, size_t n, size_t es, int (*cmp)(const void *, const void
loop: SWAPINIT(a, es);
swap_cnt = 0;
if (n < 7) {
- for (pm = a + es; pm < (char *) a + n * es; pm += es)
+ for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
for (pl = pm; pl > (char *) a && CMP(pl - es, pl) > 0;
pl -= es)
swap(pl, pl - es);
return;
}
- pm = a + (n / 2) * es;
+ pm = (char *) a + (n / 2) * es;
if (n > 7) {
pl = a;
- pn = a + (n - 1) * es;
+ pn = (char *) a + (n - 1) * es;
if (n > 40) {
d = (n / 8) * es;
pl = med3(pl, pl + d, pl + 2 * d, cmp);
@@ -112,9 +112,9 @@ loop: SWAPINIT(a, es);
pm = med3(pl, pm, pn, cmp);
}
swap(a, pm);
- pa = pb = a + es;
+ pa = pb = (char *) a + es;
- pc = pd = a + (n - 1) * es;
+ pc = pd = (char *) a + (n - 1) * es;
for (;;) {
while (pb <= pc && (r = CMP(pb, a)) <= 0) {
if (r == 0) {
@@ -140,14 +140,14 @@ loop: SWAPINIT(a, es);
pc -= es;
}
if (swap_cnt == 0) { /* Switch to insertion sort */
- for (pm = a + es; pm < (char *) a + n * es; pm += es)
+ for (pm = (char *) a + es; pm < (char *) a + n * es; pm += es)
for (pl = pm; pl > (char *) a && CMP(pl - es, pl) > 0;
pl -= es)
swap(pl, pl - es);
return;
}
- pn = a + n * es;
+ pn = (char *) a + n * es;
r = MIN(pa - (char *)a, pb - pa);
vecswap(a, pb - r, r);
r = MIN(pd - pc, pn - pd - es);
--
Debian repository for ClamAV
More information about the Pkg-clamav-commits
mailing list