diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2006-07-27 23:18:35 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2006-07-27 23:18:35 +0000 |
| commit | c7662795f519d2b6797e4b1ac7fa4a22afa26310 (patch) | |
| tree | b1737dfa78d8e7bfb2d5a7e9831bab91869ade97 /lib/backupstore | |
| parent | a85b710c46ec79e968da349304f30945cb9b7bc1 (diff) | |
* merge
- This is my current patch queue. I think that all of these are safe
to apply. This is just under half of the pending changes in
chris/general (the easy half).
Diffstat (limited to 'lib/backupstore')
| -rw-r--r-- | lib/backupstore/BackupStoreAccounts.cpp | 5 | ||||
| -rw-r--r-- | lib/backupstore/BackupStoreCheck.cpp | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/backupstore/BackupStoreAccounts.cpp b/lib/backupstore/BackupStoreAccounts.cpp index 36d9cad3..eb10b385 100644 --- a/lib/backupstore/BackupStoreAccounts.cpp +++ b/lib/backupstore/BackupStoreAccounts.cpp @@ -141,8 +141,9 @@ void BackupStoreAccounts::GetAccountRoot(int32_t ID, std::string &rRootDirOut, i std::string BackupStoreAccounts::MakeAccountRootDir(int32_t ID, int DiscSet) const { char accid[64]; // big enough! - ::sprintf(accid, "%08x/", ID); - return std::string(std::string(BOX_RAIDFILE_ROOT_BBSTORED DIRECTORY_SEPARATOR) + accid); + ::sprintf(accid, "%08x" DIRECTORY_SEPARATOR, ID); + return std::string(std::string(BOX_RAIDFILE_ROOT_BBSTORED + DIRECTORY_SEPARATOR) + accid); } diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp index fb48c3da..16d397a2 100644 --- a/lib/backupstore/BackupStoreCheck.cpp +++ b/lib/backupstore/BackupStoreCheck.cpp @@ -328,7 +328,8 @@ void BackupStoreCheck::CheckObjectsDir(int64_t StartID) std::string dirName; StoreStructure::MakeObjectFilename(StartID, mStoreRoot, mDiscSetNumber, dirName, false /* don't make sure the dir exists */); // Check expectations - ASSERT(dirName.size() > 4 && dirName[dirName.size() - 4] == '/'); + ASSERT(dirName.size() > 4 && + dirName[dirName.size() - 4] == DIRECTORY_SEPARATOR_ASCHAR); // Remove the filename from it dirName.resize(dirName.size() - 4); // four chars for "/o00" @@ -377,7 +378,9 @@ void BackupStoreCheck::CheckObjectsDir(int64_t StartID) if(!fileOK) { // Unexpected or bad file, delete it - ::printf("Spurious file %s/%s found%s\n", dirName.c_str(), (*i).c_str(), mFixErrors?", deleting":""); + ::printf("Spurious file %s" DIRECTORY_SEPARATOR "%s " + "found%s\n", dirName.c_str(), (*i).c_str(), + mFixErrors?", deleting":""); ++mNumberErrorsFound; if(mFixErrors) { |