BSD 4_4_Lite1 release

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

diff --git a/usr/src/lib/libc/db/hash/ndbm.c b/usr/src/lib/libc/db/hash/ndbm.c
index d53f6f6..89b9916 100644 (file)
--- a/usr/src/lib/libc/db/hash/ndbm.c
+++ b/usr/src/lib/libc/db/hash/ndbm.c
@@ -1,15 +1,41 @@
 /*-
 /*-

- * 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[] = "@(#)ndbm.c     5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)ndbm.c     8.2 (Berkeley) 9/11/93";

 #endif /* LIBC_SCCS and not lint */
 
 /*
 #endif /* LIBC_SCCS and not lint */
 
 /*


@@ -18,10 +44,11 @@ static char sccsid[] = "@(#)ndbm.c  5.12 (Berkeley) %G%";
  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>

-#define __DBINTERFACE_PRIVATE
+

 #include <ndbm.h>
 #include <stdio.h>
 #include <string.h>
 #include <ndbm.h>
 #include <stdio.h>
 #include <string.h>

+

 #include "hash.h"
 
 /*
 #include "hash.h"
 
 /*


@@ -37,15 +64,15 @@ dbm_open(file, flags, mode)
        HASHINFO info;
        char path[MAXPATHLEN];
 
        HASHINFO info;
        char path[MAXPATHLEN];
 

-       info.bsize = 1024;
-       info.ffactor = 5;
+       info.bsize = 4096;
+       info.ffactor = 40;

        info.nelem = 1;
        info.cachesize = NULL;
        info.hash = NULL;
        info.lorder = 0;
        (void)strcpy(path, file);
        (void)strcat(path, DBM_SUFFIX);
        info.nelem = 1;
        info.cachesize = NULL;
        info.hash = NULL;
        info.lorder = 0;
        (void)strcpy(path, file);
        (void)strcat(path, DBM_SUFFIX);

-       return ((DBM *)__hash_open(path, flags, mode, &info));
+       return ((DBM *)__hash_open(path, flags, mode, &info, 0));

 }
 
 extern void
 }
 
 extern void