KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix some signed/unsigned comparisons. Fix prototypes while I'm here.

Browse Source 
PR:		28890
Submitted by:	matthias.andree at web dot de
MFC after:	7 days
This commit is contained in:
Brian Somers
2005-01-12 03:39:34 +00:00
parent 0e32d64e56
commit 41843e7135
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libc/stdlib/merge.c
+6 -3
View File
@@ -60,8 +60,10 @@ __FBSDID("$FreeBSD$");
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
static void setup(u_char *, u_char *, size_t, size_t, int (*)()); static void setup(u_char *, u_char *, size_t, size_t,
static void insertionsort(u_char *, size_t, size_t, int (*)()); int (*)(const void *, const void *));
static void insertionsort(u_char *, size_t, size_t,
int (*)(const void *, const void *));
#define ISIZE sizeof(int) #define ISIZE sizeof(int)
#define PSIZE sizeof(u_char *) #define PSIZE sizeof(u_char *)
@@ -103,7 +105,8 @@ mergesort(base, nmemb, size, cmp)
size_t size; size_t size;
int (*cmp)(const void *, const void *); int (*cmp)(const void *, const void *);
{ {
int i, sense; size_t i;
int sense;
int big, iflag; int big, iflag;
u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2; u_char *f1, *f2, *t, *b, *tp2, *q, *l1, *l2;
u_char *list2, *list1, *p2, *p, *last, **p1; u_char *list2, *list1, *p2, *p, *last, **p1;