diff options
| author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-28 11:38:04 +0000 |
|---|---|---|
| committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-28 11:38:04 +0000 |
| commit | e0e2d305e59231485377eae91e16de2441b205ba (patch) | |
| tree | d96556a144d3a4f610ddb5c02e7fcacdd8132410 /bin/bbackupd | |
| parent | fe460a91023e90632bda8ab447824e18c378376d (diff) | |
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.
Diffstat (limited to 'bin/bbackupd')
| -rw-r--r-- | bin/bbackupd/BackupClientInodeToIDMap.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/bbackupd/BackupClientInodeToIDMap.cpp b/bin/bbackupd/BackupClientInodeToIDMap.cpp index c3f20df0..0d4fd507 100644 --- a/bin/bbackupd/BackupClientInodeToIDMap.cpp +++ b/bin/bbackupd/BackupClientInodeToIDMap.cpp @@ -14,7 +14,7 @@ #include <sys/types.h> #include <fcntl.h> #include <limits.h> - #include DB_HEADER + #include <db.h> #include <sys/stat.h> #endif @@ -65,7 +65,7 @@ BackupClientInodeToIDMap::~BackupClientInodeToIDMap() #ifndef BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION if(dbp != 0) { -#ifdef BERKELY_V4 +#if BDB_VERSION_MAJOR >= 3 dbp->close(0); #else dbp->close(dbp); @@ -94,7 +94,7 @@ void BackupClientInodeToIDMap::Open(const char *Filename, bool ReadOnly, bool Cr ASSERT(!mEmpty); // Open the database file -#ifdef BERKELY_V4 +#if BDB_VERSION_MAJOR >= 3 dbp = new Db(0,0); dbp->set_pagesize(1024); /* Page size: 1K. */ dbp->set_cachesize(0, 32 * 1024, 0); @@ -146,7 +146,7 @@ void BackupClientInodeToIDMap::Close() #ifndef BACKIPCLIENTINODETOIDMAP_IN_MEMORY_IMPLEMENTATION if(dbp != 0) { -#ifdef BERKELY_V4 +#if BDB_VERSION_MAJOR >= 3 if(dbp->close(0) != 0) #else if(dbp->close(dbp) != 0) @@ -188,7 +188,7 @@ void BackupClientInodeToIDMap::AddToMap(InodeRefType InodeRef, int64_t ObjectID, rec.mObjectID = ObjectID; rec.mInDirectory = InDirectory; -#ifdef BERKELY_V4 +#if BDB_VERSION_MAJOR >= 3 Dbt key(&InodeRef, sizeof(InodeRef)); Dbt data(&rec, sizeof(rec)); @@ -250,7 +250,7 @@ bool BackupClientInodeToIDMap::Lookup(InodeRefType InodeRef, int64_t &rObjectIDO THROW_EXCEPTION(BackupStoreException, InodeMapNotOpen); } -#ifdef BERKELY_V4 +#if BDB_VERSION_MAJOR >= 3 Dbt key(&InodeRef, sizeof(InodeRef)); Dbt data(0, 0); switch(dbp->get(NULL, &key, &data, 0)) @@ -280,7 +280,7 @@ bool BackupClientInodeToIDMap::Lookup(InodeRefType InodeRef, int64_t &rObjectIDO } // Check for sensible return -#ifdef BERKELY_V4 +#if BDB_VERSION_MAJOR >= 3 if(key.get_data() == 0 || data.get_size() != sizeof(IDBRecord)) { // Assert in debug version |