diff options
Diffstat (limited to 'lib/libc/stdlib')
-rw-r--r-- | lib/libc/stdlib/bsearch.c | 4 | ||||
-rw-r--r-- | lib/libc/stdlib/heapsort.c | 4 | ||||
-rw-r--r-- | lib/libc/stdlib/malloc.c | 6 | ||||
-rw-r--r-- | lib/libc/stdlib/merge.c | 8 | ||||
-rw-r--r-- | lib/libc/stdlib/qsort.c | 4 | ||||
-rw-r--r-- | lib/libc/stdlib/radixsort.c | 6 | ||||
-rw-r--r-- | lib/libc/stdlib/rand48.h | 4 | ||||
-rw-r--r-- | lib/libc/stdlib/tfind.c | 2 | ||||
-rw-r--r-- | lib/libc/stdlib/tsearch.c | 6 |
9 files changed, 22 insertions, 22 deletions
diff --git a/lib/libc/stdlib/bsearch.c b/lib/libc/stdlib/bsearch.c index eeef9bffc66..1903202b6c2 100644 --- a/lib/libc/stdlib/bsearch.c +++ b/lib/libc/stdlib/bsearch.c @@ -32,7 +32,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: bsearch.c,v 1.2 1996/08/19 08:33:26 tholo Exp $"; +static char *rcsid = "$OpenBSD: bsearch.c,v 1.3 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <stdlib.h> @@ -59,7 +59,7 @@ bsearch(key, base0, nmemb, size, compar) const void *base0; size_t nmemb; register size_t size; - register int (*compar) __P((const void *, const void *)); + register int (*compar)(const void *, const void *); { register const char *base = base0; register int lim, cmp; diff --git a/lib/libc/stdlib/heapsort.c b/lib/libc/stdlib/heapsort.c index e3e4392e055..2770e5b977c 100644 --- a/lib/libc/stdlib/heapsort.c +++ b/lib/libc/stdlib/heapsort.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: heapsort.c,v 1.2 1996/08/19 08:33:32 tholo Exp $"; +static char *rcsid = "$OpenBSD: heapsort.c,v 1.3 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -141,7 +141,7 @@ int heapsort(vbase, nmemb, size, compar) void *vbase; size_t nmemb, size; - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { register int cnt, i, j, l; register char tmp, *tmp1, *tmp2; diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c index 6fae6fe5651..bca7bb7c4e1 100644 --- a/lib/libc/stdlib/malloc.c +++ b/lib/libc/stdlib/malloc.c @@ -8,7 +8,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: malloc.c,v 1.46 2002/01/23 20:42:24 fgsch Exp $"; +static char rcsid[] = "$OpenBSD: malloc.c,v 1.47 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -88,7 +88,7 @@ static char rcsid[] = "$OpenBSD: malloc.c,v 1.46 2002/01/23 20:42:24 fgsch Exp $ * we use the unwrapped syscall _thread_sys_write() */ # define write _thread_sys_write - ssize_t write __P((int, const void *, size_t)); + ssize_t write(int, const void *, size_t); # undef malloc # undef realloc # undef free @@ -243,7 +243,7 @@ static int malloc_utrace; struct ut { void *p; size_t s; void *r; }; -void utrace __P((struct ut *, int)); +void utrace(struct ut *, int); #define UTRACE(a, b, c) \ if (malloc_utrace) \ diff --git a/lib/libc/stdlib/merge.c b/lib/libc/stdlib/merge.c index 0a1015ad9dd..345eb2fd8ba 100644 --- a/lib/libc/stdlib/merge.c +++ b/lib/libc/stdlib/merge.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: merge.c,v 1.3 1996/09/15 09:31:50 tholo Exp $"; +static char *rcsid = "$OpenBSD: merge.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -99,7 +99,7 @@ mergesort(base, nmemb, size, cmp) void *base; size_t nmemb; register size_t size; - int (*cmp) __P((const void *, const void *)); + int (*cmp)(const void *, const void *); { register int i, sense; int big, iflag; @@ -257,7 +257,7 @@ COPY: b = t; void setup(list1, list2, n, size, cmp) size_t n, size; - int (*cmp) __P((const void *, const void *)); + int (*cmp)(const void *, const void *); u_char *list1, *list2; { int i, length, size2, tmp, sense; @@ -332,7 +332,7 @@ static void insertionsort(a, n, size, cmp) u_char *a; size_t n, size; - int (*cmp) __P((const void *, const void *)); + int (*cmp)(const void *, const void *); { u_char *ai, *s, *t, *u, tmp; int i; diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c index 1c3020b5958..d16ed7b0bd7 100644 --- a/lib/libc/stdlib/qsort.c +++ b/lib/libc/stdlib/qsort.c @@ -32,14 +32,14 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: qsort.c,v 1.5 1997/06/20 11:19:38 deraadt Exp $"; +static char *rcsid = "$OpenBSD: qsort.c,v 1.6 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> #include <stdlib.h> static __inline char *med3 __P((char *, char *, char *, int (*)())); -static __inline void swapfunc __P((char *, char *, int, int)); +static __inline void swapfunc(char *, char *, int, int); #define min(a, b) (a) < (b) ? a : b diff --git a/lib/libc/stdlib/radixsort.c b/lib/libc/stdlib/radixsort.c index 41ed9624663..40d7c0789f6 100644 --- a/lib/libc/stdlib/radixsort.c +++ b/lib/libc/stdlib/radixsort.c @@ -35,7 +35,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char *rcsid = "$OpenBSD: radixsort.c,v 1.3 1996/08/19 08:33:44 tholo Exp $"; +static char *rcsid = "$OpenBSD: radixsort.c,v 1.4 2002/02/16 21:27:24 millert Exp $"; #endif /* LIBC_SCCS and not lint */ /* @@ -61,8 +61,8 @@ typedef struct { } stack; static __inline void simplesort - __P((const u_char **, int, int, const u_char *, u_int)); -static void r_sort_a __P((const u_char **, int, int, const u_char *, u_int)); +(const u_char **, int, int, const u_char *, u_int); +static void r_sort_a(const u_char **, int, int, const u_char *, u_int); static void r_sort_b __P((const u_char **, const u_char **, int, int, const u_char *, u_int)); diff --git a/lib/libc/stdlib/rand48.h b/lib/libc/stdlib/rand48.h index e7cb3e03330..afa49f65f3c 100644 --- a/lib/libc/stdlib/rand48.h +++ b/lib/libc/stdlib/rand48.h @@ -10,7 +10,7 @@ * of any kind. I shall in no event be liable for anything that happens * to anyone/anything when using this software. * - * $OpenBSD: rand48.h,v 1.2 1996/08/19 08:33:45 tholo Exp $ + * $OpenBSD: rand48.h,v 1.3 2002/02/16 21:27:24 millert Exp $ */ #ifndef _RAND48_H_ @@ -19,7 +19,7 @@ #include <math.h> #include <stdlib.h> -void __dorand48 __P((unsigned short[3])); +void __dorand48(unsigned short[3]); #define RAND48_SEED_0 (0x330e) #define RAND48_SEED_1 (0xabcd) diff --git a/lib/libc/stdlib/tfind.c b/lib/libc/stdlib/tfind.c index 9e5bd4b0f25..5c3b8c17f57 100644 --- a/lib/libc/stdlib/tfind.c +++ b/lib/libc/stdlib/tfind.c @@ -22,7 +22,7 @@ void * tfind(vkey, vrootp, compar) const void *vkey; /* key to be found */ void *const *vrootp; /* address of the tree root */ - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { char *key = (char *)vkey; node **rootp = (node **)vrootp; diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c index 562ace1845b..0ad5866172a 100644 --- a/lib/libc/stdlib/tsearch.c +++ b/lib/libc/stdlib/tsearch.c @@ -23,7 +23,7 @@ void * tsearch(vkey, vrootp, compar) const void *vkey; /* key to be located */ void **vrootp; /* address of tree root */ - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { register node *q; char *key = (char *)vkey; @@ -54,7 +54,7 @@ void * tdelete(vkey, vrootp, compar) const void *vkey; /* key to be deleted */ void **vrootp; /* address of the root of tree */ - int (*compar) __P((const void *, const void *)); + int (*compar)(const void *, const void *); { node **rootp = (node **)vrootp; char *key = (char *)vkey; @@ -117,7 +117,7 @@ trecurse(root, action, level) void twalk(vroot, action) const void *vroot; /* Root of the tree to be walked */ - void (*action) __P((const void *, VISIT, int)); + void (*action)(const void *, VISIT, int); { node *root = (node *)vroot; |