[Box Backup-commit] COMMIT r3612 - box/trunk/lib/server

subversion at boxbackup.org subversion at boxbackup.org
Thu Aug 6 20:14:47 BST 2015


Author: chris
Date: 2015-08-06 19:14:47 +0000 (Thu, 06 Aug 2015)
New Revision: 3612

Modified:
   box/trunk/lib/server/ServerControl.cpp
Log:
Fix return types for integer function to be integers

Modified: box/trunk/lib/server/ServerControl.cpp
===================================================================
--- box/trunk/lib/server/ServerControl.cpp	2015-08-06 19:12:58 UTC (rev 3611)
+++ box/trunk/lib/server/ServerControl.cpp	2015-08-06 19:14:47 UTC (rev 3612)
@@ -229,12 +229,11 @@
 
 int StartDaemon(int current_pid, const std::string& cmd_line, const char* pid_file)
 {
-	TEST_THAT_OR(current_pid == 0, return false);
+	TEST_THAT_OR(current_pid == 0, return 0);
 
 	int new_pid = LaunchServer(cmd_line, pid_file);
+	TEST_THAT_OR(new_pid != -1 && new_pid != 0, return 0);
 
-	TEST_THAT_OR(new_pid != -1 && new_pid != 0, return false);
-
 	::sleep(1);
 	TEST_THAT_OR(ServerIsAlive(new_pid), return 0);
 	return new_pid;




More information about the Boxbackup-commit mailing list