Fix minor bugs in commit 30bf468 et al.

tglsfdc · tglsfdc · commit c2be18c333bc · 2014-11-30T12:20:57.000-05:00
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
@@ -643,7 +643,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");
@@ -746,7 +746,6 @@ connectOptions2(PGconn *conn)
 			conn->pgpass = strdup(DefaultPassword);
 			if (!conn->pgpass)
 				goto oom_error;
-
 		}
 		else
 			conn->dot_pgpass_used = true;
