Changeset 288 for box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp

Timestamp:

28/12/2005 11:38:04 (6 years ago)

Author:

martin

Message:

Now supports Berkeley DB versions >= 4.1 in addition to 1.x. The versions inbetween are not supported because they require code changes and I don't have them available to test against.

File:

• box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp (modified) (7 diffs)

box/trunk/bin/bbackupd/BackupClientInodeToIDMap.cpp

@@ -15 +15 @@
         #include <fcntl.h>
         #include <limits.h>
-        #include DB_HEADER
+        #include <db.h>
         #include <sys/stat.h>
 #endif
@@ -66 +66 @@
         if(dbp != 0)
         {
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
                 dbp->close(0);
 #else
@@ -95 +95 @@
         
         // Open the database file
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         dbp = new Db(0,0);
         dbp->set_pagesize(1024);                /* Page size: 1K. */
@@ -147 +147 @@
         if(dbp != 0)
         {
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
                 if(dbp->close(0) != 0)
 #else
@@ -189 +189 @@
         rec.mInDirectory = InDirectory;
 
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         Dbt key(&InodeRef, sizeof(InodeRef));
         Dbt data(&rec, sizeof(rec));
@@ -251 +251 @@
         }
 
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         Dbt key(&InodeRef, sizeof(InodeRef));
         Dbt data(0, 0);
@@ -281 +281 @@
 
         // Check for sensible return
-#ifdef BERKELY_V4
+#if BDB_VERSION_MAJOR >= 3
         if(key.get_data() == 0 || data.get_size() != sizeof(IDBRecord))
         {