386BSD 0.1 development

[unix-history] / usr / src / include / db.h

diff --git a/usr/src/include/db.h b/usr/src/include/db.h
index 09e5a6f..44c1099 100644 (file)
--- a/usr/src/include/db.h
+++ b/usr/src/include/db.h
@@ -2,14 +2,42 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * %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.

  *
  *

- *     @(#)db.h        5.4 (Berkeley) %G%
+ * 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.
+ *
+ *     @(#)db.h        5.10 (Berkeley) 4/2/91

  */
 
 #ifndef _DB_H_
 #define        _DB_H_
 
  */
 
 #ifndef _DB_H_
 #define        _DB_H_
 

+#include <sys/cdefs.h>
+

 /* flags for DB.put() call */
 #define        R_IBEFORE       1               /* RECNO */
 #define        R_IAFTER        2               /* RECNO */
 /* flags for DB.put() call */
 #define        R_IBEFORE       1               /* RECNO */
 #define        R_IAFTER        2               /* RECNO */


@@ -25,19 +53,24 @@
 
 /* key/data structure -- a data-base thang */
 typedef struct {
 
 /* key/data structure -- a data-base thang */
 typedef struct {

-       char *data;
+       void *data;

        int size;
 } DBT;
 
 /* access method description structure */
        int size;
 } DBT;
 
 /* access method description structure */

-typedef struct {
-       char *internal;         /* access method private; really void * */
-       int (*close)();
-       int (*del)();
-       int (*get)();
-       int (*put)();
-       int (*seq)();
-       int (*sync)();
+typedef struct __db {
+       void *internal;         /* access method private */
+#define        DB_BTREE        1
+#define        DB_HASH         2
+#define        DB_RECNO        3
+       int type;               /* type of underlying db */
+       int (*close) __P((const struct __db *));
+       int (*del) __P((const struct __db *, const DBT *, unsigned int));
+       int (*get) __P((const struct __db *, DBT *, DBT *, unsigned int));
+       int (*put) __P((const struct __db *, const DBT *, const DBT *,
+               unsigned int));
+       int (*seq) __P((const struct __db *, DBT *, DBT *, unsigned int));
+       int (*sync) __P((const struct __db *));

 } DB;
 
 #define        BTREEMAGIC      0x053162
 } DB;
 
 #define        BTREEMAGIC      0x053162


@@ -61,7 +94,7 @@ typedef struct {
        int bsize;              /* bucket size */
        int ffactor;            /* fill factor */
        int nelem;              /* number of elements */
        int bsize;              /* bucket size */
        int ffactor;            /* fill factor */
        int nelem;              /* number of elements */

-       int ncached;            /* bytes to cache */
+       int cachesize;          /* bytes to cache */

        int (*hash)();          /* hash function */
        int lorder;             /* byte order */
 } HASHINFO;
        int (*hash)();          /* hash function */
        int lorder;             /* byte order */
 } HASHINFO;


@@ -113,7 +146,6 @@ typedef struct {
        ((char *)&(b))[1] = ((char *)&(a))[0]; \
 }
 
        ((char *)&(b))[1] = ((char *)&(a))[0]; \
 }
 

-#include <sys/cdefs.h>

 __BEGIN_DECLS
 DB     *btree_open
            __P((const char *, int, int, const BTREEINFO *));
 __BEGIN_DECLS
 DB     *btree_open
            __P((const char *, int, int, const BTREEINFO *));