mirror of
https://gitlab.freedesktop.org/libbsd/libbsd.git
synced 2025-10-15 15:16:53 +02:00
Use ANSI C prototypes
This commit is contained in:
19
src/merge.c
19
src/merge.c
@@ -95,11 +95,8 @@ static void insertionsort(u_char *, size_t, size_t,
|
||||
* Arguments are as for qsort.
|
||||
*/
|
||||
int
|
||||
mergesort(base, nmemb, size, cmp)
|
||||
void *base;
|
||||
size_t nmemb;
|
||||
size_t size;
|
||||
int (*cmp)(const void *, const void *);
|
||||
mergesort(void *base, size_t nmemb, size_t size,
|
||||
int (*cmp)(const void *, const void *))
|
||||
{
|
||||
size_t i;
|
||||
int sense;
|
||||
@@ -259,10 +256,8 @@ COPY: b = t;
|
||||
* is defined. Otherwise simple pairwise merging is used.)
|
||||
*/
|
||||
void
|
||||
setup(list1, list2, n, size, cmp)
|
||||
size_t n, size;
|
||||
int (*cmp)(const void *, const void *);
|
||||
u_char *list1, *list2;
|
||||
setup(u_char *list1, u_char *list2, size_t n, size_t size,
|
||||
int (*cmp)(const void *, const void *))
|
||||
{
|
||||
int i, length, size2, tmp, sense;
|
||||
u_char *f1, *f2, *s, *l2, *last, *p2;
|
||||
@@ -333,10 +328,8 @@ setup(list1, list2, n, size, cmp)
|
||||
* last 4 elements.
|
||||
*/
|
||||
static void
|
||||
insertionsort(a, n, size, cmp)
|
||||
u_char *a;
|
||||
size_t n, size;
|
||||
int (*cmp)(const void *, const void *);
|
||||
insertionsort(u_char *a, size_t n, size_t size,
|
||||
int (*cmp)(const void *, const void *))
|
||||
{
|
||||
u_char *ai, *s, *t, *u, tmp;
|
||||
int i;
|
||||
|
Reference in New Issue
Block a user