diff options
| author | pfg <pfg@FreeBSD.org> | 2014-07-21 22:47:59 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2014-07-21 22:47:59 +0000 |
| commit | f5657a9f1cb2b536b62d19ff125fece464f29581 (patch) | |
| tree | e1fa5505ad0535abee62ca48f8a853dadbeb5363 /lib/libc/stdlib/tsearch.c | |
| parent | 832f66713038de9143d814e4a87f26dd2032ee6d (diff) | |
| download | FreeBSD-src-f5657a9f1cb2b536b62d19ff125fece464f29581.zip FreeBSD-src-f5657a9f1cb2b536b62d19ff125fece464f29581.tar.gz | |
MFC r268644:
libc/stdlib: Minor cleanups to code originating in NetBSD
Mostly ANSIfication and typos.
Obtained from: NetBSD
Diffstat (limited to 'lib/libc/stdlib/tsearch.c')
| -rw-r--r-- | lib/libc/stdlib/tsearch.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/libc/stdlib/tsearch.c b/lib/libc/stdlib/tsearch.c index 149c2bb..16bbf7c 100644 --- a/lib/libc/stdlib/tsearch.c +++ b/lib/libc/stdlib/tsearch.c @@ -1,4 +1,4 @@ -/* $NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $ */ +/* $NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $ */ /* * Tree search generalized from Knuth (6.2.2) Algorithm T just like @@ -14,7 +14,7 @@ #include <sys/cdefs.h> #if 0 #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $"); +__RCSID("$NetBSD: tsearch.c,v 1.7 2012/06/25 22:32:45 abs Exp $"); #endif /* LIBC_SCCS and not lint */ #endif __FBSDID("$FreeBSD$"); @@ -25,10 +25,8 @@ __FBSDID("$FreeBSD$"); /* find or insert datum into search tree */ void * -tsearch(vkey, vrootp, compar) - const void *vkey; /* key to be located */ - void **vrootp; /* address of tree root */ - int (*compar)(const void *, const void *); +tsearch(const void *vkey, void **vrootp, + int (*compar)(const void *, const void *)) { node_t *q; node_t **rootp = (node_t **)vrootp; @@ -50,8 +48,7 @@ tsearch(vkey, vrootp, compar) q = malloc(sizeof(node_t)); /* T5: key not found */ if (q != 0) { /* make new node */ *rootp = q; /* link new node to old */ - /* LINTED const castaway ok */ - q->key = (void *)vkey; /* initialize new node */ + q->key = __DECONST(void *, vkey);/* initialize new node */ q->llink = q->rlink = NULL; } return q; |
