Style changes, added cvs keywords

[openldap] / include / ldbm.h

diff --git a/include/ldbm.h b/include/ldbm.h
index d1b93fb4a3403a54ad3573709401dec62d4f6e92..0440858bfd72d22e762b311a43f1206c2c6cb71a 100644 (file)
--- a/include/ldbm.h
+++ b/include/ldbm.h
@@ -12,6 +12,8 @@
 #ifndef _LDBM_H_
 #define _LDBM_H_
 
+#include <ldap_cdefs.h>
+
 #ifdef LDBM_USE_DBBTREE
 
 /*****************************************************************
@@ -24,7 +26,7 @@
 #include <limits.h>
 #include <fcntl.h>
 
-#ifdef HAVE_DB185_H
+#ifdef HAVE_DB_185_H
 #      include <db_185.h>
 #else
 #      include <db.h>
@@ -35,12 +37,16 @@
 #endif
 
 
+LDAP_BEGIN_DECL
+
 typedef DBT    Datum;
 #define dsize  size
 #define dptr   data
 
 typedef DB     *LDBM;
 
+LDAP_END_DECL
+
 #define DB_TYPE                DB_BTREE
 
 /* for ldbm_open */
@@ -78,7 +84,7 @@ typedef DB    *LDBM;
 #include <limits.h>
 #include <fcntl.h>
 
-#ifdef HAVE_DB185_H
+#ifdef HAVE_DB_185_H
 #      include <db_185.h>
 #else
 #      include <db.h>
@@ -88,12 +94,16 @@ typedef DB  *LDBM;
 #      endif
 #endif
 
+LDAP_BEGIN_DECL
+
 typedef DBT    Datum;
 #define dsize  size
 #define dptr   data
 
 typedef DB     *LDBM;
 
+LDAP_END_DECL
+
 #define DB_TYPE                DB_HASH
 
 /* for ldbm_open */
@@ -127,12 +137,16 @@ typedef DB        *LDBM;
 
 #include <gdbm.h>
 
+LDAP_BEGIN_DECL
+
 typedef datum          Datum;
 
 typedef GDBM_FILE      LDBM;
 
 extern gdbm_error      gdbm_errno;
 
+LDAP_END_DECL
+
 /* for ldbm_open */
 #define LDBM_READER    GDBM_READER
 #define LDBM_WRITER    GDBM_WRITER
@@ -162,10 +176,14 @@ extern gdbm_error gdbm_errno;
 #include <fcntl.h>
 #endif
 
+LDAP_BEGIN_DECL
+
 typedef datum  Datum;
 
 typedef DBM    *LDBM;
 
+LDAP_END_DECL
+
 /* for ldbm_open */
 #define LDBM_READER    O_RDONLY
 #define LDBM_WRITER    O_WRONLY
@@ -182,6 +200,14 @@ typedef DBM        *LDBM;
 
 #endif
 
+LDAP_BEGIN_DECL
+
+int ldbm_initialize( void );
+int ldbm_shutdown( void );
+#if HAVE_BERKELEY_DB2
+extern DB_ENV  ldbm_Env;
+#endif
+
 int    ldbm_errno( LDBM ldbm );
 LDBM   ldbm_open( char *name, int rw, int mode, int dbcachesize );
 void   ldbm_close( LDBM ldbm );
@@ -201,4 +227,14 @@ int        ldbm_delete( LDBM ldbm, Datum key );
        Datum   ldbm_nextkey( LDBM ldbm, Datum key );
 #endif
 
+
+/* initialization of Datum structures */
+#ifdef HAVE_BERKELEY_DB2
+#   define ldbm_datum_init(d) ((void)memset(&(d), 0, sizeof(Datum)))
+#else
+#   define ldbm_datum_init(d) ((void)0)
+#endif  /* HAVE_BERKELEY_DB2 */
+
+LDAP_END_DECL
+
 #endif /* _ldbm_h_ */