[Box Backup-commit] COMMIT r2506 - in box/trunk: lib/common lib/raidfile lib/server test/backupdiff test/bbackupd test/common test/raidfile

[boxbackup-dev at boxbackup.org]

Author: martin
Date: 2009-04-23 01:38:39 +0100 (Thu, 23 Apr 2009)
New Revision: 2506

Modified:
   box/trunk/lib/common/Test.cpp
   box/trunk/lib/common/Test.h
   box/trunk/lib/raidfile/RaidFileUtil.h
   box/trunk/lib/server/ServerControl.cpp
   box/trunk/test/backupdiff/difftestfiles.cpp
   box/trunk/test/bbackupd/testbbackupd.cpp
   box/trunk/test/common/testcommon.cpp
   box/trunk/test/raidfile/testraidfile.cpp
Log:
Fixes for gcc 4.4.

Modified: box/trunk/lib/common/Test.cpp
===================================================================
--- box/trunk/lib/common/Test.cpp	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/lib/common/Test.cpp	2009-04-23 00:38:39 UTC (rev 2506)
@@ -416,7 +416,7 @@
 
 
 // Wait a given number of seconds for something to complete
-void wait_for_operation(int seconds, char* message)
+void wait_for_operation(int seconds, const char* message)
 {
 	if (Logging::GetGlobalLevel() >= Log::TRACE)
 	{

Modified: box/trunk/lib/common/Test.h
===================================================================
--- box/trunk/lib/common/Test.h	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/lib/common/Test.h	2009-04-23 00:38:39 UTC (rev 2506)
@@ -158,7 +158,7 @@
 void terminate_bbackupd(int pid);
 
 // Wait a given number of seconds for something to complete
-void wait_for_operation(int seconds, char* message);
+void wait_for_operation(int seconds, const char* message);
 void safe_sleep(int seconds);
 
 #endif // TEST__H

Modified: box/trunk/lib/raidfile/RaidFileUtil.h
===================================================================
--- box/trunk/lib/raidfile/RaidFileUtil.h	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/lib/raidfile/RaidFileUtil.h	2009-04-23 00:38:39 UTC (rev 2506)
@@ -37,7 +37,7 @@
 		AsRaidWithMissingNotRecoverable = 4
 	} ExistType;
 	
-	typedef enum
+	enum
 	{
 		Stripe1Exists = 1,
 		Stripe2Exists = 2,

Modified: box/trunk/lib/server/ServerControl.cpp
===================================================================
--- box/trunk/lib/server/ServerControl.cpp	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/lib/server/ServerControl.cpp	2009-04-23 00:38:39 UTC (rev 2506)
@@ -1,6 +1,7 @@
 #include "Box.h"
 
 #include <errno.h>
+#include <stdio.h>
 
 #ifdef HAVE_SYS_TYPES_H
 	#include <sys/types.h>

Modified: box/trunk/test/backupdiff/difftestfiles.cpp
===================================================================
--- box/trunk/test/backupdiff/difftestfiles.cpp	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/test/backupdiff/difftestfiles.cpp	2009-04-23 00:38:39 UTC (rev 2506)
@@ -10,6 +10,7 @@
 #include "Box.h"
 
 #include <string.h>
+#include <stdio.h>
 
 #include "FileStream.h"
 #include "PartialReadStream.h"

Modified: box/trunk/test/bbackupd/testbbackupd.cpp
===================================================================
--- box/trunk/test/bbackupd/testbbackupd.cpp	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/test/bbackupd/testbbackupd.cpp	2009-04-23 00:38:39 UTC (rev 2506)
@@ -87,7 +87,7 @@
 // two cycles and a bit
 #define TIME_TO_WAIT_FOR_BACKUP_OPERATION	12
 
-void wait_for_backup_operation(char* message)
+void wait_for_backup_operation(const char* message)
 {
 	wait_for_operation(TIME_TO_WAIT_FOR_BACKUP_OPERATION, message);
 }

Modified: box/trunk/test/common/testcommon.cpp
===================================================================
--- box/trunk/test/common/testcommon.cpp	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/test/common/testcommon.cpp	2009-04-23 00:38:39 UTC (rev 2506)
@@ -368,7 +368,7 @@
 	// Leave timers initialised for rest of test.
 	// Test main() will cleanup after test finishes.
 
-	static char *testfilelines[] =
+	static const char *testfilelines[] =
 	{
 		"First line",
 		"Second line",

Modified: box/trunk/test/raidfile/testraidfile.cpp
===================================================================
--- box/trunk/test/raidfile/testraidfile.cpp	2009-04-23 00:01:10 UTC (rev 2505)
+++ box/trunk/test/raidfile/testraidfile.cpp	2009-04-23 00:38:39 UTC (rev 2506)
@@ -11,6 +11,7 @@
 
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <errno.h>
 
 #ifdef HAVE_SYSCALL