Revert "Add libpq function PQhostaddr()."

nmisch · nmisch · commit 2cda889984a6 · 2014-11-29T12:31:21.000-05:00
This reverts commit 9f80f48. The function returned the raw value of a connection parameter, a task served by PQconninfo(). The next commit will reimplement the psql \conninfo change that way. Back-patch to 9.4, where that commit first appeared.
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
@@ -1467,24 +1467,6 @@ char *PQhost(const PGconn *conn);
      </listitem>
     </varlistentry>
 
-    <varlistentry id="libpq-pqhostaddr">
-     <term>
-      <function>PQhostaddr</function>
-      <indexterm>
-       <primary>PQhostaddr</primary>
-      </indexterm>
-     </term>
-
-     <listitem>
-      <para>
-       Returns the server numeric IP address of the connection.
-<synopsis>
-char *PQhostaddr(const PGconn *conn);
-</synopsis>
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry id="libpq-pqport">
      <term>
       <function>PQport</function>
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
@@ -302,7 +302,7 @@ exec_command(const char *cmd,
 	else if (strcmp(cmd, "conninfo") == 0)
 	{
 		char	   *db = PQdb(pset.db);
-		char	   *host = (PQhostaddr(pset.db) != NULL) ? PQhostaddr(pset.db) : PQhost(pset.db);
+		char	   *host = PQhost(pset.db);
 
 		if (db == NULL)
 			printf(_("You are currently not connected to a database.\n"));
diff --git a/src/interfaces/libpq/exports.txt b/src/interfaces/libpq/exports.txt
@@ -165,4 +165,3 @@ lo_lseek64                162
 lo_tell64                 163
 lo_truncate64             164
 PQconninfo                165
-PQhostaddr                166
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -5340,14 +5340,6 @@ PQhost(const PGconn *conn)
 	}
 }
 
-char *
-PQhostaddr(const PGconn *conn)
-{
-	if (!conn)
-		return NULL;
-	return conn->pghostaddr;
-}
-
 char *
 PQport(const PGconn *conn)
 {
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
@@ -301,7 +301,6 @@ extern char *PQdb(const PGconn *conn);
 extern char *PQuser(const PGconn *conn);
 extern char *PQpass(const PGconn *conn);
 extern char *PQhost(const PGconn *conn);
-extern char *PQhostaddr(const PGconn *conn);
 extern char *PQport(const PGconn *conn);
 extern char *PQtty(const PGconn *conn);
 extern char *PQoptions(const PGconn *conn);

Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ exec_command(const char *cmd,`
`302`	`302`	`else if (strcmp(cmd, "conninfo") == 0)`
`303`	`303`	`{`
`304`	`304`	`char *db = PQdb(pset.db);`
`305`		`- char *host = (PQhostaddr(pset.db) != NULL) ? PQhostaddr(pset.db) : PQhost(pset.db);`
	`305`	`+ char *host = PQhost(pset.db);`
`306`	`306`
`307`	`307`	`if (db == NULL)`
`308`	`308`	`printf(_("You are currently not connected to a database.\n"));`
Original file line number	Diff line number	Diff line change
`@@ -5340,14 +5340,6 @@ PQhost(const PGconn *conn)`
`5340`	`5340`	`}`
`5341`	`5341`	`}`
`5342`	`5342`
`5343`		`-char *`
`5344`		`-PQhostaddr(const PGconn *conn)`
`5345`		`-{`
`5346`		`- if (!conn)`
`5347`		`- return NULL;`
`5348`		`- return conn->pghostaddr;`
`5349`		`-}`
`5350`		`-`
`5351`	`5343`	`char *`
`5352`	`5344`	`PQport(const PGconn *conn)`
`5353`	`5345`	`{`