vacuumdb: Don't assign negative values to a boolean.
authorAndres Freund <andres@anarazel.de>
Wed, 12 Aug 2015 14:49:36 +0000 (16:49 +0200)
committerAndres Freund <andres@anarazel.de>
Sat, 15 Aug 2015 14:51:34 +0000 (16:51 +0200)
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

src/bin/scripts/vacuumdb.c

index 7e72db1edf7f287f8c8cf1c1a8c931c0bafc29a8..f0dc6a7bd5dd7f0cb92d5399386d4b0f347d12df 100644 (file)
@@ -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);
 }