diff options
-rw-r--r-- | include/search.h | 5 | ||||
-rw-r--r-- | lib/libc/db/hash/hsearch.c | 6 | ||||
-rw-r--r-- | lib/libc/db/hash/search.h | 51 |
3 files changed, 8 insertions, 54 deletions
diff --git a/include/search.h b/include/search.h index c72b16f..3776539 100644 --- a/include/search.h +++ b/include/search.h @@ -41,18 +41,21 @@ typedef struct node { #endif __BEGIN_DECLS +/* stdlib.h void *bsearch __P((const void *, const void *, size_t, size_t, int (*)(const void *, const void *))); + */ int hcreate __P((size_t)); void hdestroy __P((void)); ENTRY *hsearch __P((ENTRY, ACTION)); - +/* depricated interfaces (in libcompat) void *lfind __P((const void *, const void *, size_t *, size_t, int (*)(const void *, const void *))); void *lsearch __P((const void *, const void *, size_t *, size_t, int (*)(const void *, const void *))); void insque __P((void *, void *)); void remque __P((void *)); + */ void *tdelete __P((const void *, void **, int (*)(const void *, const void *))); diff --git a/lib/libc/db/hash/hsearch.c b/lib/libc/db/hash/hsearch.c index 6185330..7af9d12 100644 --- a/lib/libc/db/hash/hsearch.c +++ b/lib/libc/db/hash/hsearch.c @@ -32,6 +32,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD$ */ #if defined(LIBC_SCCS) && !defined(lint) @@ -44,14 +46,14 @@ static char sccsid[] = "@(#)hsearch.c 8.4 (Berkeley) 7/21/94"; #include <string.h> #include <db.h> -#include "search.h" +#include <search.h> static DB *dbp = NULL; static ENTRY retval; extern int hcreate(nel) - u_int nel; + size_t nel; { HASHINFO info; diff --git a/lib/libc/db/hash/search.h b/lib/libc/db/hash/search.h deleted file mode 100644 index 4d3b914..0000000 --- a/lib/libc/db/hash/search.h +++ /dev/null @@ -1,51 +0,0 @@ -/*- - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Margo Seltzer. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)search.h 8.1 (Berkeley) 6/4/93 - */ - -/* Backward compatibility to hsearch interface. */ -typedef struct entry { - char *key; - char *data; -} ENTRY; - -typedef enum { - FIND, ENTER -} ACTION; - -int hcreate __P((unsigned int)); -void hdestroy __P((void)); -ENTRY *hsearch __P((ENTRY, ACTION)); |