[Box Backup-dev] COMMIT r834 - box/chris/merge/bin/bbstored

boxbackup-dev at fluffy.co.uk boxbackup-dev at fluffy.co.uk
Wed Aug 30 20:20:35 BST 2006


Author: chris
Date: 2006-08-30 20:20:35 +0100 (Wed, 30 Aug 2006)
New Revision: 834

Modified:
   box/chris/merge/bin/bbstored/HousekeepStoreAccount.cpp
Log:
* bin/bbstored/HousekeepStoreAccount.cpp
- Revert to trunk


Modified: box/chris/merge/bin/bbstored/HousekeepStoreAccount.cpp
===================================================================
--- box/chris/merge/bin/bbstored/HousekeepStoreAccount.cpp	2006-08-30 19:01:05 UTC (rev 833)
+++ box/chris/merge/bin/bbstored/HousekeepStoreAccount.cpp	2006-08-30 19:20:35 UTC (rev 834)
@@ -225,7 +225,6 @@
 // --------------------------------------------------------------------------
 bool HousekeepStoreAccount::ScanDirectory(int64_t ObjectID)
 {
-#ifndef WIN32
 	if((--mCountUntilNextInterprocessMsgCheck) <= 0)
 	{
 		mCountUntilNextInterprocessMsgCheck = POLL_INTERPROCESS_MSG_CHECK_FREQUENCY;
@@ -236,7 +235,6 @@
 			return false;
 		}
 	}
-#endif
 
 	// Get the filename
 	std::string objectFilename;
@@ -253,7 +251,6 @@
 	// Read the directory in
 	BackupStoreDirectory dir;
 	dir.ReadFromStream(*dirStream, IOStream::TimeOutInfinite);
-	dirStream->Close();
 	
 	// Is it empty?
 	if(dir.GetNumberOfEntries() == 0)
@@ -488,7 +485,6 @@
 	// (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 @@
 				return true;
 			}
 		}
-#endif
 
 		// Load up the directory it's in
 		// Get the filename
@@ -734,7 +729,6 @@
 		// 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 @@
 					return true;
 				}
 			}
-#endif
 
 			// Do not delete the root directory
 			if(*i == BACKUPSTORE_ROOT_DIRECTORY_ID)




More information about the Boxbackup-dev mailing list