Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dispose the private search.h header and use <search.h>, which is a superset,

Browse Source 
instead.
This commit is contained in:
kleink 1999-02-16 17:59:18 +00:00
parent 4806be8d02
commit 3b5a19a494
3 changed files with 4 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/db/hash/README
View File

@ -1,4 +1,4 @@
# $NetBSD: README,v 1.4 1996/05/03 21:43:44 cgd Exp $ # $NetBSD: README,v 1.5 1999/02/16 17:59:18 kleink Exp $
# @(#)README 8.1 (Berkeley) 6/4/93 # @(#)README 8.1 (Berkeley) 6/4/93
This package implements a superset of the hsearch and dbm/ndbm libraries. This package implements a superset of the hsearch and dbm/ndbm libraries.
@ -45,10 +45,6 @@ Test Programs:
NOTES: NOTES:
The file search.h is provided for using the hsearch compatible interface
on BSD systems. On System V derived systems, search.h should appear in
/usr/include.
The man page ../man/db.3 explains the interface to the hashing system. The man page ../man/db.3 explains the interface to the hashing system.
The file hash.ps is a postscript copy of a paper explaining The file hash.ps is a postscript copy of a paper explaining
the history, implementation, and performance of the hash package. the history, implementation, and performance of the hash package.

6
lib/libc/db/hash/hsearch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hsearch.c,v 1.11 1997/07/13 18:52:07 christos Exp $ */ /* $NetBSD: hsearch.c,v 1.12 1999/02/16 17:59:18 kleink Exp $ */
/*- /*-
* Copyright (c) 1990, 1993 * Copyright (c) 1990, 1993
@ -41,17 +41,17 @@
#if 0 #if 0
static char sccsid[] = "@(#)hsearch.c 8.4 (Berkeley) 7/21/94"; static char sccsid[] = "@(#)hsearch.c 8.4 (Berkeley) 7/21/94";
#else #else
__RCSID("$NetBSD: hsearch.c,v 1.11 1997/07/13 18:52:07 christos Exp $"); __RCSID("$NetBSD: hsearch.c,v 1.12 1999/02/16 17:59:18 kleink Exp $");
#endif #endif
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include <search.h>
#include <string.h> #include <string.h>
#include <db.h> #include <db.h>
#include "search.h"
static DB *dbp = NULL; static DB *dbp = NULL;
static ENTRY retval; static ENTRY retval;

53
lib/libc/db/hash/search.h
View File

@ -1,53 +0,0 @@
/* $NetBSD: search.h,v 1.6 1996/05/03 21:44:01 cgd Exp $ */
/*-
* 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));