[Box Backup-dev] COMMIT r680 - box/chris/general/bin/bbstored

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-07-23 22:15:44 +0000 (Sun, 23 Jul 2006)
New Revision: 680

Modified:
   box/chris/general/bin/bbstored/BackupCommands.cpp
   box/chris/general/bin/bbstored/BackupContext.cpp
   box/chris/general/bin/bbstored/BackupStoreDaemon.cpp
   box/chris/general/bin/bbstored/BackupStoreDaemon.h
Log:
* bin/bbstored/BackupCommands.cpp
* bin/bbstored/BackupStoreDaemon.cpp
- Whitespace changes to reduce diff with trunk (cosmetic)

* bin/bbstored/BackupContext.cpp
- Comment spelling fix (cosmetic)

* bin/bbstored/BackupStoreDaemon.h
- Whitespace changes to reduce diff with trunk (cosmetic)
- #ifdef structure change to reduce patch size (cosmetic, I hope)


Modified: box/chris/general/bin/bbstored/BackupCommands.cpp
===================================================================
--- box/chris/general/bin/bbstored/BackupCommands.cpp	2006-07-23 09:44:24 UTC (rev 679)
+++ box/chris/general/bin/bbstored/BackupCommands.cpp	2006-07-23 22:15:44 UTC (rev 680)
@@ -320,7 +320,7 @@
 		// OK! The last entry in the chain is the full file, the others are patches back from it.
 		// Open the last one, which is the current from file
 		std::auto_ptr<IOStream> from(rContext.OpenObject(patchChain[patchChain.size() - 1]));
-
+		
 		// Then, for each patch in the chain, do a combine
 		for(int p = ((int)patchChain.size()) - 2; p >= 0; --p)
 		{
@@ -428,7 +428,7 @@
 
 	// Stream the reordered stream to the peer
 	rProtocol.SendStreamAfterCommand(stream.get());
-
+	
 	// Don't delete the stream here
 	stream.release();
 

Modified: box/chris/general/bin/bbstored/BackupContext.cpp
===================================================================
--- box/chris/general/bin/bbstored/BackupContext.cpp	2006-07-23 09:44:24 UTC (rev 679)
+++ box/chris/general/bin/bbstored/BackupContext.cpp	2006-07-23 22:15:44 UTC (rev 680)
@@ -464,7 +464,7 @@
 				FileStream diff(tempFn.c_str(), O_RDWR | O_CREAT | O_EXCL);
 				FileStream diff2(tempFn.c_str(), O_RDONLY);
 
-				// Unlink it immediately, so it definately goes away
+				// Unlink it immediately, so it definitely goes away
 				if(::unlink(tempFn.c_str()) != 0)
 				{
 					THROW_EXCEPTION(CommonException, OSFileError);

Modified: box/chris/general/bin/bbstored/BackupStoreDaemon.cpp
===================================================================
--- box/chris/general/bin/bbstored/BackupStoreDaemon.cpp	2006-07-23 09:44:24 UTC (rev 679)
+++ box/chris/general/bin/bbstored/BackupStoreDaemon.cpp	2006-07-23 22:15:44 UTC (rev 680)
@@ -161,7 +161,7 @@
 	mExtendedLogging = false;
 	const Configuration &config(GetConfiguration());
 	mExtendedLogging = config.GetKeyValueBool("ExtendedLogging");
-
+	
 #ifndef WIN32	
 	// Fork off housekeeping daemon -- must only do this the first time Run() is called
 	if(!mHaveForkedHousekeeping)
@@ -229,7 +229,7 @@
 #endif // !WIN32
 		// In server process -- use the base class to do the magic
 		ServerTLS<BOX_PORT_BBSTORED>::Run();
-	
+		
 #ifndef WIN32	
 		// Why did it stop? Tell the housekeeping process to do the same
 		if(IsReloadConfigWanted())

Modified: box/chris/general/bin/bbstored/BackupStoreDaemon.h
===================================================================
--- box/chris/general/bin/bbstored/BackupStoreDaemon.h	2006-07-23 09:44:24 UTC (rev 679)
+++ box/chris/general/bin/bbstored/BackupStoreDaemon.h	2006-07-23 22:15:44 UTC (rev 680)
@@ -58,7 +58,7 @@
 	virtual const char *DaemonBanner() const;
 
 	const ConfigurationVerify *GetConfigVerify() const;
-
+	
 #ifndef WIN32	
 	// Housekeeping functions
 	void HousekeepingProcess();
@@ -67,22 +67,19 @@
 
 	void LogConnectionStats(const char *commonName, const SocketStreamTLS &s);
 
-
 private:
 	BackupStoreAccountDatabase *mpAccountDatabase;
 	BackupStoreAccounts *mpAccounts;
 	bool mExtendedLogging;
 	bool mHaveForkedHousekeeping;
 	bool mIsHousekeepingProcess;
-
-#ifndef WIN32	
-	SocketStream mInterProcessCommsSocket;
-	IOStreamGetLine mInterProcessComms;
-#endif
-
+	
 #ifdef WIN32
 	virtual void OnIdle();
 	bool mHousekeepingInited;
+#else
+	SocketStream mInterProcessCommsSocket;
+	IOStreamGetLine mInterProcessComms;
 #endif
 
 	void HousekeepingInit();