Libc-391.tar.gz

[apple/libc.git] / include / db.h

diff --git a/include/db.h b/include/db.h
index bd1eb9f169347f3634b722ce32f9ef102793fd59..fc49e1ea28b455023f79c55d92211989c6ec71fa 100644 (file)
--- a/include/db.h
+++ b/include/db.h
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -125,11 +123,11 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
 typedef struct __db {
        DBTYPE type;                    /* Underlying db type. */
        int (*close)(struct __db *);
-       int (*del)(const struct __db *, const DBT *, u_int);
-       int (*get)(const struct __db *, const DBT *, DBT *, u_int);
-       int (*put)(const struct __db *, DBT *, const DBT *, u_int);
-       int (*seq)(const struct __db *, DBT *, DBT *, u_int);
-       int (*sync)(const struct __db *, u_int);
+       int (*del)(const struct __db *, const DBT *, unsigned int);
+       int (*get)(const struct __db *, const DBT *, DBT *, unsigned int);
+       int (*put)(const struct __db *, DBT *, const DBT *, unsigned int);
+       int (*seq)(const struct __db *, DBT *, DBT *, unsigned int);
+       int (*sync)(const struct __db *, unsigned int);
        void *internal;                 /* Access method private. */
        int (*fd)(const struct __db *);
 } DB;
@@ -140,16 +138,16 @@ typedef struct __db {
 /* Structure used to pass parameters to the btree routines. */
 typedef struct {
 #define        R_DUP           0x01    /* duplicate keys */
-       u_long  flags;
-       u_int   cachesize;      /* bytes to cache */
-       int     maxkeypage;     /* maximum keys per page */
-       int     minkeypage;     /* minimum keys per page */
-       u_int   psize;          /* page size */
-       int     (*compare)      /* comparison function */
-           (const DBT *, const DBT *);
-       size_t  (*prefix)       /* prefix function */
-           (const DBT *, const DBT *);
-       int     lorder;         /* byte order */
+       unsigned long   flags;
+       unsigned int    cachesize;      /* bytes to cache */
+       int             maxkeypage;     /* maximum keys per page */
+       int             minkeypage;     /* minimum keys per page */
+       unsigned int    psize;          /* page size */
+       int             (*compare)      /* comparison function */
+                       (const DBT *, const DBT *);
+       size_t          (*prefix)       /* prefix function */
+                       (const DBT *, const DBT *);
+       int             lorder;         /* byte order */
 } BTREEINFO;
 
 #define        HASHMAGIC       0x061561
@@ -157,10 +155,10 @@ typedef struct {
 
 /* Structure used to pass parameters to the hashing routines. */
 typedef struct {
-       u_int   bsize;          /* bucket size */
-       u_int   ffactor;        /* fill factor */
-       u_int   nelem;          /* number of elements */
-       u_int   cachesize;      /* bytes to cache */
+       unsigned int    bsize;          /* bucket size */
+       unsigned int    ffactor;        /* fill factor */
+       unsigned int    nelem;          /* number of elements */
+       unsigned int    cachesize;      /* bytes to cache */
        u_int32_t               /* hash function */
                (*hash)(const void *, size_t);
        int     lorder;         /* byte order */
@@ -171,12 +169,12 @@ typedef struct {
 #define        R_FIXEDLEN      0x01    /* fixed-length records */
 #define        R_NOKEY         0x02    /* key not required */
 #define        R_SNAPSHOT      0x04    /* snapshot the input */
-       u_long  flags;
-       u_int   cachesize;      /* bytes to cache */
-       u_int   psize;          /* page size */
-       int     lorder;         /* byte order */
-       size_t  reclen;         /* record length (fixed-length records) */
-       u_char  bval;           /* delimiting byte (variable-length records */
+       unsigned long   flags;
+       unsigned int    cachesize;      /* bytes to cache */
+       unsigned int    psize;          /* page size */
+       int             lorder;         /* byte order */
+       size_t          reclen;         /* record length (fixed-length records) */
+       unsigned char   bval;           /* delimiting byte (variable-length records */
        char    *bfname;        /* btree file name */ 
 } RECNOINFO;