From 2cda889984a6f5ad405318f9e91202d258383b66 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Sat, 29 Nov 2014 12:31:21 -0500
Subject: [PATCH] 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.
---
doc/src/sgml/libpq.sgml | 18 ------------------
src/bin/psql/command.c | 2 +-
src/interfaces/libpq/exports.txt | 1 -
src/interfaces/libpq/fe-connect.c | 8 --------
src/interfaces/libpq/libpq-fe.h | 1 -
5 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index e23e91d9bb3..d829a4b9d55 100644
--- 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
index 62ea0440efa..eb281a3dcbc 100644
--- 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 cbb6e36c119..93da50df311 100644
--- 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 703cbac37ae..3af222b5a09 100644
--- 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
index 80591728a0f..b81dc16285f 100644
--- 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);
--
GitLab