From 32598ce2f6026b48b96ffb87557712bdd7a2557e Mon Sep 17 00:00:00 2001 From: brian Date: Wed, 12 Jan 2005 03:39:34 +0000 Subject: Fix some signed/unsigned comparisons. Fix prototypes while I'm here. PR: 28890 Submitted by: matthias.andree at web dot de MFC after: 7 days --- lib/libc/stdlib/merge.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/libc/stdlib/merge.c') diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index f03bb3d..baf566b 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -60,8 +60,10 @@ __FBSDID("$FreeBSD$"); #include #include -static void setup(u_char *, u_char *, size_t, size_t, int (*)()); -static void insertionsort(u_char *, size_t, size_t, int (*)()); +static void setup(u_char *, u_char *, size_t, size_t, + int (*)(const void *, const void *)); +static void insertionsort(u_char *, size_t, size_t, + int (*)(const void *, const void *)); #define ISIZE sizeof(int) #define PSIZE sizeof(u_char *) @@ -103,7 +105,8 @@ mergesort(base, nmemb, size, cmp) size_t size; int (*cmp)(const void *, const void *); { - int i, sense; + size_t i; + int sense; int big, iflag; u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; u_char *list2, *list1, *p2, *p, *last, **p1; -- cgit v1.1