diff options
Diffstat (limited to 'lib/backupstore')
-rw-r--r-- | lib/backupstore/BackupAccountControl.h | 5 | ||||
-rw-r--r-- | lib/backupstore/BackupClientFileAttributes.cpp | 6 | ||||
-rw-r--r-- | lib/backupstore/BackupProtocol.txt (renamed from lib/backupstore/backupprotocol.txt) | 0 | ||||
-rw-r--r-- | lib/backupstore/BackupStoreFileDiff.cpp | 2 | ||||
-rw-r--r-- | lib/backupstore/HousekeepStoreAccount.cpp | 2 | ||||
-rw-r--r-- | lib/backupstore/Makefile.extra | 4 |
6 files changed, 8 insertions, 11 deletions
diff --git a/lib/backupstore/BackupAccountControl.h b/lib/backupstore/BackupAccountControl.h index bc041794..00118ec2 100644 --- a/lib/backupstore/BackupAccountControl.h +++ b/lib/backupstore/BackupAccountControl.h @@ -14,7 +14,6 @@ #include "BackupStoreAccountDatabase.h" #include "HTTPResponse.h" -#include "NamedLock.h" #include "S3Client.h" class BackupStoreDirectory; @@ -42,14 +41,12 @@ public: class S3BackupFileSystem { private: - const Configuration& mConfig; std::string mBasePath; S3Client& mrClient; public: S3BackupFileSystem(const Configuration& config, const std::string& BasePath, S3Client& rClient) - : mConfig(config), - mBasePath(BasePath), + : mBasePath(BasePath), mrClient(rClient) { } std::string GetDirectoryURI(int64_t ObjectID); diff --git a/lib/backupstore/BackupClientFileAttributes.cpp b/lib/backupstore/BackupClientFileAttributes.cpp index 7ec6f478..37140301 100644 --- a/lib/backupstore/BackupClientFileAttributes.cpp +++ b/lib/backupstore/BackupClientFileAttributes.cpp @@ -545,7 +545,7 @@ void BackupClientFileAttributes::FillAttributesLink( void BackupClientFileAttributes::FillExtendedAttr(StreamableMemBlock &outputBlock, const std::string& Filename) { -#ifdef HAVE_SYS_XATTR_H +#if defined HAVE_LLISTXATTR && defined HAVE_LGETXATTR int listBufferSize = 10000; char* list = new char[listBufferSize]; @@ -693,7 +693,7 @@ void BackupClientFileAttributes::FillExtendedAttr(StreamableMemBlock &outputBloc throw; } delete[] list; -#endif +#endif // defined HAVE_LLISTXATTR && defined HAVE_LGETXATTR } // -------------------------------------------------------------------------- @@ -992,7 +992,7 @@ void BackupClientFileAttributes::EnsureClearAvailable() const // -------------------------------------------------------------------------- void BackupClientFileAttributes::WriteExtendedAttr(const std::string& Filename, int xattrOffset) const { -#ifdef HAVE_SYS_XATTR_H +#if defined HAVE_LSETXATTR const char* buffer = static_cast<char*>(mpClearAttributes->GetBuffer()); uint32_t xattrBlockLength = 0; diff --git a/lib/backupstore/backupprotocol.txt b/lib/backupstore/BackupProtocol.txt index 5921d009..5921d009 100644 --- a/lib/backupstore/backupprotocol.txt +++ b/lib/backupstore/BackupProtocol.txt diff --git a/lib/backupstore/BackupStoreFileDiff.cpp b/lib/backupstore/BackupStoreFileDiff.cpp index 1d83d854..e6df11a6 100644 --- a/lib/backupstore/BackupStoreFileDiff.cpp +++ b/lib/backupstore/BackupStoreFileDiff.cpp @@ -16,7 +16,7 @@ #ifdef HAVE_TIME_H #include <time.h> -#elif HAVE_SYS_TIME_H +#elif defined HAVE_SYS_TIME_H #include <sys/time.h> #endif diff --git a/lib/backupstore/HousekeepStoreAccount.cpp b/lib/backupstore/HousekeepStoreAccount.cpp index f24d7227..d5acf62c 100644 --- a/lib/backupstore/HousekeepStoreAccount.cpp +++ b/lib/backupstore/HousekeepStoreAccount.cpp @@ -932,7 +932,7 @@ void HousekeepStoreAccount::UpdateDirectorySize( BackupStoreDirectory& rDirectory, IOStream::pos_type new_size_in_blocks) { -#ifndef NDEBUG +#ifndef BOX_RELEASE_BUILD { std::string dirFilename; MakeObjectFilename(rDirectory.GetObjectID(), dirFilename); diff --git a/lib/backupstore/Makefile.extra b/lib/backupstore/Makefile.extra index c55fd549..6f181abd 100644 --- a/lib/backupstore/Makefile.extra +++ b/lib/backupstore/Makefile.extra @@ -1,9 +1,9 @@ MAKEPROTOCOL = ../../lib/server/makeprotocol.pl -GEN_CMD = $(MAKEPROTOCOL) backupprotocol.txt +GEN_CMD = $(MAKEPROTOCOL) BackupProtocol.txt # AUTOGEN SEEDING -autogen_BackupProtocol.cpp autogen_BackupProtocol.h: $(MAKEPROTOCOL) backupprotocol.txt +autogen_BackupProtocol.cpp autogen_BackupProtocol.h: $(MAKEPROTOCOL) BackupProtocol.txt $(_PERL) $(GEN_CMD) |