d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hide dbopen() in the POSIX namespace, and use standard type names

Browse Source 
throughout so that this compiles in strict POSIX mode.
This commit is contained in:
David Schultz 2009-03-14 20:05:27 +00:00
parent 1a4cc57833
commit ea3186bda4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=189827
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
include/db.h
View File

@ -47,11 +47,11 @@
#define RET_SPECIAL 1 #define RET_SPECIAL 1
#define MAX_PAGE_NUMBER 0xffffffff /* >= # of pages in a file */ #define MAX_PAGE_NUMBER 0xffffffff /* >= # of pages in a file */
typedef u_int32_t pgno_t; typedef uint32_t pgno_t;
#define MAX_PAGE_OFFSET 65535 /* >= # of bytes in a page */ #define MAX_PAGE_OFFSET 65535 /* >= # of bytes in a page */
typedef u_int16_t indx_t; typedef uint16_t indx_t;
#define MAX_REC_NUMBER 0xffffffff /* >= # of records in a tree */ #define MAX_REC_NUMBER 0xffffffff /* >= # of records in a tree */
typedef u_int32_t recno_t; typedef uint32_t recno_t;
/* Key/data structure -- a Data-Base Thang. */ /* Key/data structure -- a Data-Base Thang. */
typedef struct { typedef struct {
@ -101,11 +101,11 @@ typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
typedef struct __db { typedef struct __db {
DBTYPE type; /* Underlying db type. */ DBTYPE type; /* Underlying db type. */
int (*close)(struct __db *); int (*close)(struct __db *);
int (*del)(const struct __db *, const DBT *, u_int); int (*del)(const struct __db *, const DBT *, unsigned int);
int (*get)(const struct __db *, const DBT *, DBT *, u_int); int (*get)(const struct __db *, const DBT *, DBT *, unsigned int);
int (*put)(const struct __db *, DBT *, const DBT *, u_int); int (*put)(const struct __db *, DBT *, const DBT *, unsigned int);
int (*seq)(const struct __db *, DBT *, DBT *, u_int); int (*seq)(const struct __db *, DBT *, DBT *, unsigned int);
int (*sync)(const struct __db *, u_int); int (*sync)(const struct __db *, unsigned int);
void *internal; /* Access method private. */ void *internal; /* Access method private. */
int (*fd)(const struct __db *); int (*fd)(const struct __db *);
} DB; } DB;
@ -116,16 +116,16 @@ typedef struct __db {
/* Structure used to pass parameters to the btree routines. */ /* Structure used to pass parameters to the btree routines. */
typedef struct { typedef struct {
#define R_DUP 0x01 /* duplicate keys */ #define R_DUP 0x01 /* duplicate keys */
u_long flags; unsigned long flags;
u_int cachesize; /* bytes to cache */ unsigned int cachesize; /* bytes to cache */
int maxkeypage; /* maximum keys per page */ int maxkeypage; /* maximum keys per page */
int minkeypage; /* minimum keys per page */ int minkeypage; /* minimum keys per page */
u_int psize; /* page size */ unsigned int psize; /* page size */
int (*compare) /* comparison function */ int (*compare) /* comparison function */
(const DBT *, const DBT *); (const DBT *, const DBT *);
size_t (*prefix) /* prefix function */ size_t (*prefix) /* prefix function */
(const DBT *, const DBT *); (const DBT *, const DBT *);
int lorder; /* byte order */ int lorder; /* byte order */
} BTREEINFO; } BTREEINFO;
#define HASHMAGIC 0x061561 #define HASHMAGIC 0x061561
@ -133,11 +133,11 @@ typedef struct {
/* Structure used to pass parameters to the hashing routines. */ /* Structure used to pass parameters to the hashing routines. */
typedef struct { typedef struct {
u_int bsize; /* bucket size */ unsigned int bsize; /* bucket size */
u_int ffactor; /* fill factor */ unsigned int ffactor; /* fill factor */
u_int nelem; /* number of elements */ unsigned int nelem; /* number of elements */
u_int cachesize; /* bytes to cache */ unsigned int cachesize; /* bytes to cache */
u_int32_t /* hash function */ uint32_t /* hash function */
(*hash)(const void *, size_t); (*hash)(const void *, size_t);
int lorder; /* byte order */ int lorder; /* byte order */
} HASHINFO; } HASHINFO;
@ -147,12 +147,12 @@ typedef struct {
#define R_FIXEDLEN 0x01 /* fixed-length records */ #define R_FIXEDLEN 0x01 /* fixed-length records */
#define R_NOKEY 0x02 /* key not required */ #define R_NOKEY 0x02 /* key not required */
#define R_SNAPSHOT 0x04 /* snapshot the input */ #define R_SNAPSHOT 0x04 /* snapshot the input */
u_long flags; unsigned long flags;
u_int cachesize; /* bytes to cache */ unsigned int cachesize; /* bytes to cache */
u_int psize; /* page size */ unsigned int psize; /* page size */
int lorder; /* byte order */ int lorder; /* byte order */
size_t reclen; /* record length (fixed-length records) */ size_t reclen; /* record length (fixed-length records) */
u_char bval; /* delimiting byte (variable-length records */ unsigned char bval; /* delimiting byte (variable-length records */
char *bfname; /* btree file name */ char *bfname; /* btree file name */
} RECNOINFO; } RECNOINFO;
@ -164,14 +164,14 @@ typedef struct {
* P_32_COPY swap from one location to another * P_32_COPY swap from one location to another
*/ */
#define M_32_SWAP(a) { \ #define M_32_SWAP(a) { \
u_int32_t _tmp = a; \ uint32_t _tmp = a; \
((char *)&a)[0] = ((char *)&_tmp)[3]; \ ((char *)&a)[0] = ((char *)&_tmp)[3]; \
((char *)&a)[1] = ((char *)&_tmp)[2]; \ ((char *)&a)[1] = ((char *)&_tmp)[2]; \
((char *)&a)[2] = ((char *)&_tmp)[1]; \ ((char *)&a)[2] = ((char *)&_tmp)[1]; \
((char *)&a)[3] = ((char *)&_tmp)[0]; \ ((char *)&a)[3] = ((char *)&_tmp)[0]; \
} }
#define P_32_SWAP(a) { \ #define P_32_SWAP(a) { \
u_int32_t _tmp = *(u_int32_t *)a; \ uint32_t _tmp = *(uint32_t *)a; \
((char *)a)[0] = ((char *)&_tmp)[3]; \ ((char *)a)[0] = ((char *)&_tmp)[3]; \
((char *)a)[1] = ((char *)&_tmp)[2]; \ ((char *)a)[1] = ((char *)&_tmp)[2]; \
((char *)a)[2] = ((char *)&_tmp)[1]; \ ((char *)a)[2] = ((char *)&_tmp)[1]; \
@ -191,12 +191,12 @@ typedef struct {
* P_16_COPY swap from one location to another * P_16_COPY swap from one location to another
*/ */
#define M_16_SWAP(a) { \ #define M_16_SWAP(a) { \
u_int16_t _tmp = a; \ uint16_t _tmp = a; \
((char *)&a)[0] = ((char *)&_tmp)[1]; \ ((char *)&a)[0] = ((char *)&_tmp)[1]; \
((char *)&a)[1] = ((char *)&_tmp)[0]; \ ((char *)&a)[1] = ((char *)&_tmp)[0]; \
} }
#define P_16_SWAP(a) { \ #define P_16_SWAP(a) { \
u_int16_t _tmp = *(u_int16_t *)a; \ uint16_t _tmp = *(uint16_t *)a; \
((char *)a)[0] = ((char *)&_tmp)[1]; \ ((char *)a)[0] = ((char *)&_tmp)[1]; \
((char *)a)[1] = ((char *)&_tmp)[0]; \ ((char *)a)[1] = ((char *)&_tmp)[0]; \
} }
@ -207,7 +207,9 @@ typedef struct {
#endif #endif
__BEGIN_DECLS __BEGIN_DECLS
#if __BSD_VISIBLE
DB *dbopen(const char *, int, int, DBTYPE, const void *); DB *dbopen(const char *, int, int, DBTYPE, const void *);
#endif
#ifdef __DBINTERFACE_PRIVATE #ifdef __DBINTERFACE_PRIVATE
DB *__bt_open(const char *, int, int, const BTREEINFO *, int); DB *__bt_open(const char *, int, int, const BTREEINFO *, int);