Fix minor bugs in commit 30bf4689a96cd283af33edcdd6b7210df3f20cd8 et al.

Coverity complained that the "else" added to fillPGconn() was unreachable,
which it was.  Remove the dead code.  In passing, rearrange the tests so as
not to bother trying to fetch values for options that can't be assigned.

Pre-9.3 did not have that issue, but it did have a "return" that should be
"goto oom_error" to ensure that a suitable error message gets filled in.

diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 223d7101641509f7425f45ebb50bfd930e09d48e..65beaf3c8804f9a86306bf1ba95b238266f9aa53 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -664,7 +664,7 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions)
            free(conn->sslmode);
        conn->sslmode = strdup("require");
        if (!conn->sslmode)
-           return false;
+           goto oom_error;
    }
 #endif
    FILL_CONN_OPTION(conn->requirepeer, "requirepeer");
@@ -767,7 +767,6 @@ connectOptions2(PGconn *conn)
            conn->pgpass = strdup(DefaultPassword);
            if (!conn->pgpass)
                goto oom_error;
-
        }
        else
            conn->dot_pgpass_used = true;