summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorChris Wilson <chris+github@qwirx.com>2006-08-30 19:20:35 +0000
committerChris Wilson <chris+github@qwirx.com>2006-08-30 19:20:35 +0000
commit2c64f7e2f6c0dbf7106b63af2c1cd39caa2078f9 (patch)
treebc296293aaec942f178692e08776370a7c1d5a3b /bin
parentf2fedcebe908b2fb77a2743575098230ca67236a (diff)
* bin/bbstored/HousekeepStoreAccount.cpp
- Revert to trunk
Diffstat (limited to 'bin')
-rw-r--r--bin/bbstored/HousekeepStoreAccount.cpp7
1 files changed, 0 insertions, 7 deletions
diff --git a/bin/bbstored/HousekeepStoreAccount.cpp b/bin/bbstored/HousekeepStoreAccount.cpp
index 91945306..4aa1999e 100644
--- a/bin/bbstored/HousekeepStoreAccount.cpp
+++ b/bin/bbstored/HousekeepStoreAccount.cpp
@@ -225,7 +225,6 @@ void HousekeepStoreAccount::MakeObjectFilename(int64_t ObjectID, std::string &rF
// --------------------------------------------------------------------------
bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID)
{
-#ifndef WIN32
if((--mCountUntilNextInterprocessMsgCheck) <= 0)
{
mCountUntilNextInterprocessMsgCheck = POLL_INTERPROCESS_MSG_CHECK_FREQUENCY;
@@ -236,7 +235,6 @@ bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID)
return false;
}
}
-#endif
// Get the filename
std::string objectFilename;
@@ -253,7 +251,6 @@ bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID)
// Read the directory in
BackupStoreDirectory dir;
dir.ReadFromStream(*dirStream, IOStream::TimeOutInfinite);
- dirStream->Close();
// Is it empty?
if(dir.GetNumberOfEntries() == 0)
@@ -488,7 +485,6 @@ bool HousekeepStoreAccount::DeleteFiles()
// (there is likely to be more in the set than should be actually deleted).
for(std::set<DelEn, DelEnCompare>::iterator i(mPotentialDeletions.begin()); i != mPotentialDeletions.end(); ++i)
{
-#ifndef WIN32
if((--mCountUntilNextInterprocessMsgCheck) <= 0)
{
mCountUntilNextInterprocessMsgCheck = POLL_INTERPROCESS_MSG_CHECK_FREQUENCY;
@@ -499,7 +495,6 @@ bool HousekeepStoreAccount::DeleteFiles()
return true;
}
}
-#endif
// Load up the directory it's in
// Get the filename
@@ -734,7 +729,6 @@ bool HousekeepStoreAccount::DeleteEmptyDirectories()
// Go through list
for(std::vector<int64_t>::const_iterator i(mEmptyDirectories.begin()); i != mEmptyDirectories.end(); ++i)
{
-#ifndef WIN32
if((--mCountUntilNextInterprocessMsgCheck) <= 0)
{
mCountUntilNextInterprocessMsgCheck = POLL_INTERPROCESS_MSG_CHECK_FREQUENCY;
@@ -745,7 +739,6 @@ bool HousekeepStoreAccount::DeleteEmptyDirectories()
return true;
}
}
-#endif
// Do not delete the root directory
if(*i == BACKUPSTORE_ROOT_DIRECTORY_ID)