]> granicus.if.org Git - postgresql/commitdiff
Fix check for empty hostname.
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>
Mon, 10 Jul 2017 12:29:36 +0000 (15:29 +0300)
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>
Mon, 10 Jul 2017 12:29:36 +0000 (15:29 +0300)
As reported by Arthur Zakirov, Gcc 7.1 complained about this with
-Wpointer-compare.

Discussion: https://www.postgresql.org/message-id/CAKNkYnybV_NFVacGbW=VspzAo3TwRJFNi+9iBob66YqQMZopwg@mail.gmail.com

src/interfaces/libpq/fe-connect.c

index e548f3f06216659383654bb81256a7ae14eaaa3d..5a964bf0b57296da19c7281557a532c11ed17345 100644 (file)
@@ -965,8 +965,8 @@ connectOptions2(PGconn *conn)
                {
                        conn->status = CONNECTION_BAD;
                        printfPQExpBuffer(&conn->errorMessage,
-                       libpq_gettext("could not match %d host names to %d hostaddrs\n"),
-                                count_comma_separated_elems(conn->pghost), conn->nconnhost);
+                                                         libpq_gettext("could not match %d host names to %d hostaddrs\n"),
+                                                         count_comma_separated_elems(conn->pghost), conn->nconnhost);
                        return false;
                }
        }
@@ -1097,7 +1097,7 @@ connectOptions2(PGconn *conn)
                        char       *pwhost = conn->connhost[i].host;
 
                        if (conn->connhost[i].type == CHT_HOST_ADDRESS &&
-                       conn->connhost[i].host != NULL && conn->connhost[i].host != '\0')
+                               conn->connhost[i].host != NULL && conn->connhost[i].host[0] != '\0')
                                pwhost = conn->connhost[i].hostaddr;
 
                        conn->connhost[i].password =