summaryrefslogtreecommitdiff
path: root/src/lib/libc/stdlib/bsearch.c
diff options
context:
space:
mode:
authorpat <>2005-03-30 18:51:49 +0000
committerpat <>2005-03-30 18:51:49 +0000
commit894b6ab0099e7d9ca2ad9acb75246cd0a4542167 (patch)
treef9fb8e9324f6cbdc10d72cab8b889d470252465a /src/lib/libc/stdlib/bsearch.c
parent162f8b042bf31ab94714a6f194e9836c08c085f5 (diff)
downloadopenbsd-894b6ab0099e7d9ca2ad9acb75246cd0a4542167.tar.gz
openbsd-894b6ab0099e7d9ca2ad9acb75246cd0a4542167.tar.bz2
openbsd-894b6ab0099e7d9ca2ad9acb75246cd0a4542167.zip
ansi + de-register
ok otto deraadt
Diffstat (limited to 'src/lib/libc/stdlib/bsearch.c')
-rw-r--r--src/lib/libc/stdlib/bsearch.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/libc/stdlib/bsearch.c b/src/lib/libc/stdlib/bsearch.c
index 9bfbf64256..109211da92 100644
--- a/src/lib/libc/stdlib/bsearch.c
+++ b/src/lib/libc/stdlib/bsearch.c
@@ -28,7 +28,7 @@
28 */ 28 */
29 29
30#if defined(LIBC_SCCS) && !defined(lint) 30#if defined(LIBC_SCCS) && !defined(lint)
31static char *rcsid = "$OpenBSD: bsearch.c,v 1.4 2003/06/02 20:18:37 millert Exp $"; 31static char *rcsid = "$OpenBSD: bsearch.c,v 1.5 2005/03/30 18:51:49 pat Exp $";
32#endif /* LIBC_SCCS and not lint */ 32#endif /* LIBC_SCCS and not lint */
33 33
34#include <stdlib.h> 34#include <stdlib.h>
@@ -50,16 +50,12 @@ static char *rcsid = "$OpenBSD: bsearch.c,v 1.4 2003/06/02 20:18:37 millert Exp
50 * look at item 3. 50 * look at item 3.
51 */ 51 */
52void * 52void *
53bsearch(key, base0, nmemb, size, compar) 53bsearch(const void *key, const void *base0, size_t nmemb, size_t size,
54 register const void *key; 54 int (*compar)(const void *, const void *))
55 const void *base0;
56 size_t nmemb;
57 register size_t size;
58 register int (*compar)(const void *, const void *);
59{ 55{
60 register const char *base = base0; 56 const char *base = base0;
61 register int lim, cmp; 57 int lim, cmp;
62 register const void *p; 58 const void *p;
63 59
64 for (lim = nmemb; lim != 0; lim >>= 1) { 60 for (lim = nmemb; lim != 0; lim >>= 1) {
65 p = base + (lim >> 1) * size; 61 p = base + (lim >> 1) * size;