vacuumdb: Don't assign negative values to a boolean.

anarazel · anarazel · commit 1d4bd7756849 · 2015-08-15T16:51:34.000+02:00
Since a179232 (vacuumdb: enable parallel mode) -1 has been assigned to a boolean. That can, justifiedly, trigger compiler warnings. There's also no need for ternary logic, result was only ever set to 0 or -1. So don't. Discussion: 20150812084351.GD8470@awork2.anarazel.de Backpatch: 9.5
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
@@ -339,7 +339,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 	ParallelSlot *slots = NULL;
 	SimpleStringList dbtables = {NULL, NULL};
 	int			i;
-	bool		result = 0;
+	bool		failed = false;
 	bool		parallel = concurrentCons > 1;
 	const char *stage_commands[] = {
 		"SET default_statistics_target=1; SET vacuum_cost_delay=0;",
@@ -457,7 +457,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 
 		if (CancelRequested)
 		{
-			result = -1;
+			failed = true;
 			goto finish;
 		}
 
@@ -476,7 +476,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 			free_slot = GetIdleSlot(slots, concurrentCons, dbname, progname);
 			if (!free_slot)
 			{
-				result = -1;
+				failed = true;
 				goto finish;
 			}
 
@@ -518,7 +518,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 
 	termPQExpBuffer(&sql);
 
-	if (result == -1)
+	if (failed)
 		exit(1);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ vacuum_one_database(const char dbname, vacuumingOptions vacopts,`
`339`	`339`	`ParallelSlot *slots = NULL;`
`340`	`340`	`SimpleStringList dbtables = {NULL, NULL};`
`341`	`341`	`int i;`
`342`		`- bool result = 0;`
	`342`	`+ bool failed = false;`
`343`	`343`	`bool parallel = concurrentCons > 1;`
`344`	`344`	`const char *stage_commands[] = {`
`345`	`345`	`"SET default_statistics_target=1; SET vacuum_cost_delay=0;",`
`@@ -457,7 +457,7 @@ vacuum_one_database(const char dbname, vacuumingOptions vacopts,`
`457`	`457`
`458`	`458`	`if (CancelRequested)`
`459`	`459`	`{`
`460`		`- result = -1;`
	`460`	`+ failed = true;`
`461`	`461`	`goto finish;`
`462`	`462`	`}`
`463`	`463`
`@@ -476,7 +476,7 @@ vacuum_one_database(const char dbname, vacuumingOptions vacopts,`
`476`	`476`	`free_slot = GetIdleSlot(slots, concurrentCons, dbname, progname);`
`477`	`477`	`if (!free_slot)`
`478`	`478`	`{`
`479`		`- result = -1;`
	`479`	`+ failed = true;`
`480`	`480`	`goto finish;`
`481`	`481`	`}`
`482`	`482`
`@@ -518,7 +518,7 @@ vacuum_one_database(const char dbname, vacuumingOptions vacopts,`
`518`	`518`
`519`	`519`	`termPQExpBuffer(&sql);`
`520`	`520`
`521`		`- if (result == -1)`
	`521`	`+ if (failed)`
`522`	`522`	`exit(1);`
`523`	`523`	`}`
`524`	`524`