From: Andres Freund <andres@anarazel.de>
Date: Wed, 12 Aug 2015 14:49:36 +0000 (+0200)
Subject: vacuumdb: Don't assign negative values to a boolean.
X-Git-Tag: REL9_6_BETA1~1477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d4bd77568493309914217251dce5bd51f4a72b7;p=postgresql

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

Since a17923204736 (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
index 7e72db1edf..f0dc6a7bd5 100644
--- 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 @@ finish:
 
 	termPQExpBuffer(&sql);
 
-	if (result == -1)
+	if (failed)
 		exit(1);
 }