[Box Backup-commit] COMMIT r1328 - box/chris/general/bin/bbackupquery

boxbackup-dev@fluffy.co.uk boxbackup-dev@fluffy.co.uk
Sat, 03 Mar 2007 22:03:45 +0000


Author: chris
Date: 2007-03-03 22:03:45 +0000 (Sat, 03 Mar 2007)
New Revision: 1328

Modified:
   box/chris/general/bin/bbackupquery/bbackupquery.cpp
Log:
Disable WSACleanup() since it causes an abort() suddenly


Modified: box/chris/general/bin/bbackupquery/bbackupquery.cpp
===================================================================
--- box/chris/general/bin/bbackupquery/bbackupquery.cpp	2007-03-03 22:02:07 UTC (rev 1327)
+++ box/chris/general/bin/bbackupquery/bbackupquery.cpp	2007-03-03 22:03:45 UTC (rev 1328)
@@ -63,7 +63,10 @@
 
 int main(int argc, const char *argv[])
 {
+	int returnCode = 0;
+
 	MAINHELPER_SETUP_MEMORY_LEAK_EXIT_REPORT("bbackupquery.memleaks", "bbackupquery")
+	MAINHELPER_START
 
 #ifdef WIN32
 	WSADATA info;
@@ -83,13 +86,9 @@
 		BoxDebugTraceOn = false;
 	#endif
 	
-	int returnCode = 0;
-
-	MAINHELPER_START
-	
 	FILE *logFile = 0;
 
-	// Filename for configuraiton file?
+	// Filename for configuration file?
 	const char *configFilename = BOX_FILE_BBACKUPD_DEFAULT_CONFIG;
 	
 	// Flags
@@ -314,13 +313,14 @@
 	
 	// Let everything be cleaned up on exit.
 	
-	MAINHELPER_END
-	
 #ifdef WIN32
 	// Clean up our sockets
-	WSACleanup();
+	// FIXME we should do this, but I get an abort() when I try
+	// WSACleanup();
 #endif
 
+	MAINHELPER_END
+	
 	return returnCode;
 }