Revert "Add libpq function PQhostaddr()."

This reverts commit 9f80f4835a55a1cbffcda5d23a617917f3286c14.  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
index c7ac9f2671e4ffcb4bb3f4db601b56962bbaab48..578f2131eaeaad5b78facd8f2d5ee9c48da1af39 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1467,24 +1467,6 @@ char *PQhost(const PGconn *conn);
      
     
 
-    
-     
-      PQhostaddr
-      
-       PQhostaddr
-      
-     
-
-     
-      
-       Returns the server numeric IP address of the connection.
-
-char *PQhostaddr(const PGconn *conn);
-
-      
-     
-    
-
     
      
       PQport

diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 2e8935990812634ff821ded548eabf470dfe2f03..58052876d6929daa3f89720d00611be75ec39a15 100644 (file)
--- 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
index cbb6e36c119d8bc178ff42ddfb3c57243c6ec54f..93da50df31143713f38537fbe667e5d7fe48fc94 100644 (file)
--- 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
index d17a4a86cc5a724231366824a1843b7bd778eb8e..527ec9be2f1caefda30cc9e8f83715935458cd5e 100644 (file)
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -5339,14 +5339,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
index 80591728a0fe85d6ec3ba055c6890ce5e0acf271..b81dc16285f59ab60286cafefc532195a73635b2 100644 (file)
--- 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);