Add mdb_strerror(), mdb_env_set_flags()

[openldap] / libraries / libmdb / mdb.h

diff --git a/libraries/libmdb/mdb.h b/libraries/libmdb/mdb.h
index 1c111b500f7212947a8b702820f1d96189e7bc34..372dfc136437f533251624e8e23ac2fe11ec95b7 100644 (file)
--- a/libraries/libmdb/mdb.h
+++ b/libraries/libmdb/mdb.h
@@ -32,6 +32,18 @@
 
 #include <sys/types.h>
 
+#define MDB_VERSION_MAJOR      0
+#define MDB_VERSION_MINOR      8
+#define MDB_VERSION_PATCH      0
+#define MDB_VERINT(a,b,c)      ((a << 24) | (b << 16) | c)
+#define MDB_VERSION_FULL       \
+       MDB_VERINT(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH)
+#define MDB_VERSION_DATE       "August 11, 2011"
+#define MDB_VERSTR(a,b,c,d)    "MDB " #a "." #b "." #c ": (" #d ")"
+#define MDB_VERFOO(a,b,c,d)    MDB_VERSTR(a,b,c,d)
+#define        MDB_VERSION_STRING      \
+       MDB_VERFOO(MDB_VERSION_MAJOR,MDB_VERSION_MINOR,MDB_VERSION_PATCH,MDB_VERSION_DATE)
+
 struct MDB_cursor;
 struct MDB_txn;
 struct MDB_env;
@@ -43,8 +55,8 @@ typedef struct MDB_env MDB_env;
 typedef unsigned int   MDB_dbi;
 
 typedef struct MDB_val {
-       void            *mv_data;
        size_t           mv_size;
+       void            *mv_data;
 } MDB_val;
 
 typedef int  (MDB_cmp_func)(const MDB_val *a, const MDB_val *b);
@@ -70,15 +82,19 @@ typedef enum MDB_cursor_op {                /* cursor operations */
 } MDB_cursor_op;
 
 /* return codes */
+/* BerkeleyDB uses -30800 to -30999, we'll go under them */
 #define MDB_SUCCESS     0
-#define MDB_FAIL               -1
-#define MDB_KEYEXIST   -2
-#define MDB_NOTFOUND   -3
-#define MDB_VERSION_MISMATCH   -4
+#define MDB_KEYEXIST   (-30799)                /* key/data pair already exists */
+#define MDB_NOTFOUND   (-30798)                /* key/data pair not found (EOF) */
+#define MDB_PAGE_NOTFOUND      (-30797)        /* Requested page not found */
+#define MDB_CORRUPTED  (-30796)                /* Located page was wrong type */
+#define MDB_PANIC              (-30795)                /* Update of meta page failed, probably I/O error */
+#define MDB_VERSION_MISMATCH   (-30794)        /* Environment version mismatch */
 
 /* DB flags */
 #define MDB_REVERSEKEY 0x02            /* use reverse string keys */
 #define MDB_DUPSORT            0x04            /* use sorted duplicates */
+#define MDB_INTEGERKEY 0x08            /* numeric keys in native byte order */
 
 /* environment flags */
 #define MDB_FIXEDMAP   0x01            /* mmap at a fixed address */
@@ -97,17 +113,20 @@ typedef struct MDB_stat {
        unsigned long   ms_entries;
 } MDB_stat;
 
-int  mdbenv_create(MDB_env **env);
-int  mdbenv_open(MDB_env *env, const char *path, unsigned int flags, mode_t mode);
-int  mdbenv_stat(MDB_env *env, MDB_stat *stat);
-int  mdbenv_sync(MDB_env *env);
-void mdbenv_close(MDB_env *env);
-int  mdbenv_get_flags(MDB_env *env, unsigned int *flags);
-int  mdbenv_get_path(MDB_env *env, const char **path);
-int  mdbenv_set_mapsize(MDB_env *env, size_t size);
-int  mdbenv_set_maxreaders(MDB_env *env, int readers);
-int  mdbenv_get_maxreaders(MDB_env *env, int *readers);
-int  mdbenv_set_maxdbs(MDB_env *env, int dbs);
+char *mdb_version(int *major, int *minor, int *patch);
+char *mdb_strerror(int err);
+int  mdb_env_create(MDB_env **env);
+int  mdb_env_open(MDB_env *env, const char *path, unsigned int flags, mode_t mode);
+int  mdb_env_stat(MDB_env *env, MDB_stat *stat);
+int  mdb_env_sync(MDB_env *env, int force);
+void mdb_env_close(MDB_env *env);
+int  mdb_env_set_flags(MDB_env *env, unsigned int flags, int onoff);
+int  mdb_env_get_flags(MDB_env *env, unsigned int *flags);
+int  mdb_env_get_path(MDB_env *env, const char **path);
+int  mdb_env_set_mapsize(MDB_env *env, size_t size);
+int  mdb_env_set_maxreaders(MDB_env *env, int readers);
+int  mdb_env_get_maxreaders(MDB_env *env, int *readers);
+int  mdb_env_set_maxdbs(MDB_env *env, int dbs);
 
 int  mdb_txn_begin(MDB_env *env, int rdonly, MDB_txn **txn);
 int  mdb_txn_commit(MDB_txn *txn);