From 03b17210edf9302037068143643c1e06386de92e Mon Sep 17 00:00:00 2001 From: rodrigc Date: Mon, 14 Sep 2015 18:44:13 +0000 Subject: Use ANSI C prototypes. Eliminates gcc 4.9 warnings. --- lib/libc/stdlib/merge.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'lib/libc/stdlib/merge.c') diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 6b368c3..17f07eb 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -104,14 +104,10 @@ static void insertionsort(u_char *, size_t, size_t, cmp_t); */ int #ifdef I_AM_MERGESORT_B -mergesort_b(base, nmemb, size, cmp) +mergesort_b(void *base, size_t nmemb, size_t size, cmp_t cmp) #else -mergesort(base, nmemb, size, cmp) +mergesort(void *base, size_t nmemb, size_t size, cmp_t cmp) #endif - void *base; - size_t nmemb; - size_t size; - cmp_t cmp; { size_t i; int sense; @@ -271,10 +267,7 @@ COPY: b = t; * is defined. Otherwise simple pairwise merging is used.) */ void -setup(list1, list2, n, size, cmp) - size_t n, size; - u_char *list1, *list2; - cmp_t cmp; +setup(u_char *list1, u_char *list2, size_t n, size_t size, cmp_t cmp) { int i, length, size2, tmp, sense; u_char *f1, *f2, *s, *l2, *last, *p2; @@ -345,10 +338,7 @@ setup(list1, list2, n, size, cmp) * last 4 elements. */ static void -insertionsort(a, n, size, cmp) - u_char *a; - size_t n, size; - cmp_t cmp; +insertionsort(u_char *a, size_t n, size_t size, cmp_t cmp) { u_char *ai, *s, *t, *u, tmp; int i; -- cgit v1.1 From 08c0b3cae7201b8a0e94863e7c07d51f4ececd04 Mon Sep 17 00:00:00 2001 From: rodrigc Date: Sun, 20 Sep 2015 03:53:08 +0000 Subject: Add declarations to eliminate -Wmissing-prototypes warnings. --- lib/libc/stdlib/merge.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lib/libc/stdlib/merge.c') diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 17f07eb..805e995 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -99,6 +99,12 @@ static void insertionsort(u_char *, size_t, size_t, cmp_t); ((u_char *)0 + \ (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1))) +#ifdef I_AM_MERGESORT_B +int mergesort_b(void *base, size_t nmemb, size_t size, cmp_t cmp); +#else +int mergesort(void *base, size_t nmemb, size_t size, cmp_t cmp); +#endif + /* * Arguments are as for qsort. */ -- cgit v1.1 From 1737b90d795e125dbcc28ae33d27ed4fe8c5e33d Mon Sep 17 00:00:00 2001 From: rodrigc Date: Sun, 20 Sep 2015 20:15:44 +0000 Subject: Remove names from prototypes --- lib/libc/stdlib/merge.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/libc/stdlib/merge.c') diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 805e995..55b3a0c 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -100,9 +100,9 @@ static void insertionsort(u_char *, size_t, size_t, cmp_t); (((u_char *)p + PSIZE - 1 - (u_char *) 0) & ~(PSIZE - 1))) #ifdef I_AM_MERGESORT_B -int mergesort_b(void *base, size_t nmemb, size_t size, cmp_t cmp); +int mergesort_b(void *, size_t, size_t, cmp_t); #else -int mergesort(void *base, size_t nmemb, size_t size, cmp_t cmp); +int mergesort(void *, size_t, size_t, cmp_t); #endif /* -- cgit v1.1