BSD 4_4_Lite1 release

[unix-history] / usr / src / lib / libc / db / hash / hsearch.c

diff --git a/usr/src/lib/libc/db/hash/hsearch.c b/usr/src/lib/libc/db/hash/hsearch.c
index 73afaef..e4914b1 100644 (file)
--- a/usr/src/lib/libc/db/hash/hsearch.c
+++ b/usr/src/lib/libc/db/hash/hsearch.c
@@ -1,89 +1,107 @@
 /*-
 /*-

- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * 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.
  *
  *
  * This code is derived from software contributed to Berkeley by
  * Margo Seltzer.
  *

- * %sccs.include.redist.c%
+ * 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.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)hsearch.c  5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)hsearch.c  8.3 (Berkeley) 2/21/94";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>

+

 #include <fcntl.h>
 #include <string.h>
 #include <fcntl.h>
 #include <string.h>

+

 #include <db.h>
 #include "search.h"
 
 #include <db.h>
 #include "search.h"
 

-static DB      *dbp = NULL;
-static ENTRY   retval;
+static DB *dbp = NULL;
+static ENTRY retval;

 
 

-extern int
-hcreate ( nel )
-unsigned       nel;
+extern int
+hcreate(nel)
+       u_int nel;

 {
 {

-    int        status;
-    HASHINFO   info;
+       HASHINFO info;

 
 

-    info.nelem = nel;
-    info.bsize = 256;
-    info.ffactor = 8;
-    info.cachesize = NULL;
-    info.hash = NULL;
-    info.lorder = 0;
-    dbp = hash_open ( NULL, O_CREAT|O_RDWR, 0600, &info );
-    return ( (int) dbp );
+       info.nelem = nel;
+       info.bsize = 256;
+       info.ffactor = 8;
+       info.cachesize = NULL;
+       info.hash = NULL;
+       info.lorder = 0;
+       dbp = (DB *)__hash_open(NULL, O_CREAT | O_RDWR, 0600, &info, 0);
+       return ((int)dbp);

 }
 
 }
 

-
-extern ENTRY   *
-hsearch ( item, action )
-ENTRY  item;
-ACTION action;
+extern ENTRY *
+hsearch(item, action)
+       ENTRY item;
+       ACTION action;

 {
 {

-    int        status;
-    DBT        key, val;
-
-    if ( !dbp ) {
-       return(NULL);
-    }
+       DBT key, val;
+       int status;

 
 

-    key.data = (u_char *)item.key;
-    key.size = strlen(item.key) + 1;
+       if (!dbp)
+               return (NULL);
+       key.data = (u_char *)item.key;
+       key.size = strlen(item.key) + 1;

 
 

-    if ( action == ENTER ) {
-       val.data = (u_char *)item.data;
-       val.size = strlen(item.data) + 1;
-       status = (dbp->put) ( dbp, &key, &val, R_NOOVERWRITE );
-       if ( status ) {
-           return(NULL);
-       } 
-    } else {
-       /* FIND */
-       status = (dbp->get) ( dbp, &key, &val, 0 );
-       if ( status ) {
-           return ( NULL );
+       if (action == ENTER) {
+               val.data = (u_char *)item.data;
+               val.size = strlen(item.data) + 1;
+               status = (dbp->put)(dbp, &key, &val, R_NOOVERWRITE);
+               if (status)
+                       return (NULL);

        } else {
        } else {

-           item.data = (char *)val.data;
+               /* FIND */
+               status = (dbp->get)(dbp, &key, &val, 0);
+               if (status)
+                       return (NULL);
+               else
+                       item.data = (char *)val.data;

        }
        }

-    }
-    retval.key = item.key;
-    retval.data = item.data;
-    return ( &retval );
+       retval.key = item.key;
+       retval.data = item.data;
+       return (&retval);

 }
 
 }
 

-

 extern void
 extern void

-hdestroy ()
+hdestroy()

 {
 {

-    if (dbp) {
-       (void)(dbp->close) (dbp);
-       dbp = NULL;
-    }
-    return;
+       if (dbp) {
+               (void)(dbp->close)(dbp);
+               dbp = NULL;
+       }

 }
 }

-
-