[Box Backup-dev] COMMIT r204 - box/chris/win32/crash-test-pipes/bin/bbackupd

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2005-12-12 00:49:17 +0000 (Mon, 12 Dec 2005)
New Revision: 204

Modified:
   box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp
Log:
Disabled more code, still crashes

Modified: box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp	2005-12-12 00:40:53 UTC (rev 203)
+++ box/chris/win32/crash-test-pipes/bin/bbackupd/BackupDaemon.cpp	2005-12-12 00:49:17 UTC (rev 204)
@@ -43,29 +43,8 @@
 
 	void CloseCommandConnection();
 
-	/*	
-private:
-	// For the command socket
-	class CommandSocketInfo
-	{
-	public:
-		CommandSocketInfo();
-		~CommandSocketInfo();
-	private:
-		CommandSocketInfo(const CommandSocketInfo &);	// no copying
-		CommandSocketInfo &operator=(const CommandSocketInfo &);
-	public:
-	*/
-
 	WinNamedPipeStream mListeningSocket;
 
-	/*
-	};
-	
-	// Using a socket?
-	CommandSocketInfo *mpCommandSocketInfo;
-	*/
-	
 	public:
 	void RunHelperThread(void);
 };
@@ -74,11 +53,9 @@
 #define LOG_WARNING 4
 #define LOG_ERR 3
 
-void syslog(int loglevel, const char *fmt, ...);
+// void InitTimer(void);
+// void FiniTimer(void);
 
-void InitTimer(void);
-void FiniTimer(void);
-
 #define BOX_NAMED_PIPE_NAME L"\\\\.\\pipe\\boxbackup"
 
 // --------------------------------------------------------------------------
@@ -172,7 +149,7 @@
 			if (e.GetType()    == ConnectionException::ExceptionType &&
 			    e.GetSubType() == ConnectionException::SocketConnectError)
 			{
-				::syslog(LOG_ERR, "Impossible error in "
+				printf("Impossible error in "
 					"this thread! Aborting.");
 				exit(1);
 			}
@@ -213,7 +190,7 @@
         	NULL);                       // returns the thread identifier 
 
 	// init our own timer for file diff timeouts
-	InitTimer();
+	// InitTimer();
 
 	// Handle things nicely on exceptions
 	try
@@ -226,7 +203,7 @@
 	}
 	
 	// clean up windows specific stuff.
-	FiniTimer();
+	// FiniTimer();
 }
 
 // --------------------------------------------------------------------------
@@ -268,7 +245,7 @@
 	{
 		// Dispose of the socket
 		::closesocket(handle);
-		THROW_EXCEPTION(ConnectionException, Conn_SocketConnectError)
+		THROW_EXCEPTION(ConnectionException, SocketConnectError)
 	}
 }