Changeset librcc,54

Timestamp:

10/10/09 23:39:39 (1 month ago)

Author:

Suren A. Chilingaryan <csa@dside.dyndns.org>

branch-nick:

librcc

Message:

Problems with BerkeleyDB 4.7.x

Files:

• librcc/.bzrignore (modified) (1 diff)
• librcc/src/rccdb4.c (modified) (3 diffs)

librcc/.bzrignore

@@ -34 +34 @@
-external/rccexternal
-stamp-h.in
+example1
+example2
+rcc-gtk-config
+rcc-gtk2-config

librcc/src/rccdb4.c

@@ -37 +37 @@
-    DB *db;
-    
-ndef DB_LOG_AUTOREMOVE
+ ((!defined(DB_LOG_AUTOREMOVE)) && (!defined(DB_LOG_AUTO_REMOVE)))
-#  ifdef DB_VERSION_MISMATCH
-    char stmp[160];
@@ -46 +46 @@
-    if (err) return NULL;
-
-def DB_LOG_AUTOREMOVE
+ defined(DB_LOG_AUTOREMOVE)
-    dbe->set_flags(dbe, DB_LOG_AUTOREMOVE, 1);
-    dbe->set_lg_max(dbe, 131072);
-    
+    err = rccLock();
+    if (!err) {
+        err = dbe->open(dbe, dbpath, DB_CREATE|DB_INIT_TXN|DB_USE_ENVIRON|DB_INIT_LOCK|DB_INIT_MPOOL|DB_RECOVER, 00644);
+        rccUnLock();
+    } 
+# elif defined(DB_LOG_AUTO_REMOVE)
+        // Starting from berkeleydb 4.7 API has changed
+    dbe->log_set_config(dbe, DB_LOG_AUTO_REMOVE, 1);
+    dbe->set_lg_max(dbe, 131072);
+
-    err = rccLock();
-    if (!err) {
@@ -59 +69 @@
-#  ifdef DB_VERSION_MISMATCH
-    if (err == DB_VERSION_MISMATCH) {
-    
+
-            err = dbe->open(dbe, dbpath, DB_CREATE|DB_INIT_LOCK|DB_INIT_LOG|DB_INIT_MPOOL|DB_INIT_TXN|DB_USE_ENVIRON|DB_PRIVATE|DB_RECOVER, 0);
-            dbe->close(dbe, 0);
-
+
+
+
+
-            rccUnLock();
-        } else {