Fix irritating formatting bug with scheduled shutdown time reports.

Subsentient · Dec 29, 2014 · 3b38d90 · 3b38d90
1 parent 8356072
commit 3b38d90
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/src/main.c b/src/main.c
@@ -1101,16 +1101,9 @@ static ReturnCode HandleEpochCommand(int argc, char **argv)
 		char TOut[MAX_LINE_SIZE];
 
 
-		if (argc != 3)
+		if (argc < 3)
 		{
-			if (argc > 3)
-			{
-				puts("Too many arguments.\n");
-			}
-			else
-			{
-				puts("Too few arguments.\n");
-			}
+			puts("Too few arguments.\n");
 
 			PrintEpochHelp(argv[0], "start");
 			return FAILURE;

diff --git a/src/membus.c b/src/membus.c
@@ -781,9 +781,9 @@ void ParseMemBus(void)
 		{
 			char MsgBuf[MAX_LINE_SIZE];
 			const char *HType = NULL;
-			const Bool H = HaltParams.TargetHour >= 10;
-			const Bool M = HaltParams.TargetMin >= 10;
-			const Bool S = HaltParams.TargetSec >= 10;
+			Bool H;
+			Bool M;
+			Bool S;
 
 			if (HaltParams.HaltMode != -1)
 			{/*Don't let us schedule two shutdowns.*/
@@ -805,6 +805,10 @@ void ParseMemBus(void)
 				return;
 			}
 
+			H = HaltParams.TargetHour >= 10;
+			M = HaltParams.TargetMin >= 10;
+			S = HaltParams.TargetSec >= 10;
+
 			++HaltParams.JobID;
 			HaltParams.HaltMode = Signal;