Commit ef54e0d0 authored by Peter Eisentraut's avatar Peter Eisentraut

Remove remaining unixsocket-setting interfaces, since the host parameter

does that.  Disable URL-style connection parameter specification code,
which doesn't work.
parent 81c8c244
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.150 2000/11/28 06:53:33 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.151 2000/11/30 18:32:52 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -130,9 +130,6 @@ static const PQconninfoOption PQconninfoOptions[] = { ...@@ -130,9 +130,6 @@ static const PQconninfoOption PQconninfoOptions[] = {
{"port", "PGPORT", DEF_PGPORT_STR, NULL, {"port", "PGPORT", DEF_PGPORT_STR, NULL,
"Database-Port", "", 6}, "Database-Port", "", 6},
{"unixsocket", "PGUNIXSOCKET", NULL, NULL,
"Unix-Socket", "", 80},
{"tty", "PGTTY", DefaultTty, NULL, {"tty", "PGTTY", DefaultTty, NULL,
"Backend-Debug-TTY", "D", 40}, "Backend-Debug-TTY", "D", 40},
...@@ -308,8 +305,6 @@ PQconnectStart(const char *conninfo) ...@@ -308,8 +305,6 @@ PQconnectStart(const char *conninfo)
conn->pghost = tmp ? strdup(tmp) : NULL; conn->pghost = tmp ? strdup(tmp) : NULL;
tmp = conninfo_getval(connOptions, "port"); tmp = conninfo_getval(connOptions, "port");
conn->pgport = tmp ? strdup(tmp) : NULL; conn->pgport = tmp ? strdup(tmp) : NULL;
tmp = conninfo_getval(connOptions, "unixsocket");
conn->pgunixsocket = tmp ? strdup(tmp) : NULL;
tmp = conninfo_getval(connOptions, "tty"); tmp = conninfo_getval(connOptions, "tty");
conn->pgtty = tmp ? strdup(tmp) : NULL; conn->pgtty = tmp ? strdup(tmp) : NULL;
tmp = conninfo_getval(connOptions, "options"); tmp = conninfo_getval(connOptions, "options");
...@@ -402,9 +397,6 @@ PQconndefaults(void) ...@@ -402,9 +397,6 @@ PQconndefaults(void)
* PGPORT identifies TCP port to which to connect if <pgport> argument * PGPORT identifies TCP port to which to connect if <pgport> argument
* is NULL or a null string. * is NULL or a null string.
* *
* PGUNIXSOCKET identifies Unix-domain socket to which to connect; default
* is computed from the TCP port.
*
* PGTTY identifies tty to which to send messages if <pgtty> argument * PGTTY identifies tty to which to send messages if <pgtty> argument
* is NULL or a null string. * is NULL or a null string.
* *
...@@ -541,6 +533,7 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions, ...@@ -541,6 +533,7 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions,
} }
#ifdef NOT_USED /* because it's broken */
/* /*
* update_db_info - * update_db_info -
* get all additional info out of dbName * get all additional info out of dbName
...@@ -689,6 +682,8 @@ update_db_info(PGconn *conn) ...@@ -689,6 +682,8 @@ update_db_info(PGconn *conn)
return 0; return 0;
} }
#endif /* NOT_USED */
/* ---------- /* ----------
* connectMakeNonblocking - * connectMakeNonblocking -
...@@ -768,11 +763,13 @@ connectDBStart(PGconn *conn) ...@@ -768,11 +763,13 @@ connectDBStart(PGconn *conn)
if (!conn) if (!conn)
return 0; return 0;
#ifdef NOT_USED
/* /*
* parse dbName to get all additional info in it, if any * parse dbName to get all additional info in it, if any
*/ */
if (update_db_info(conn) != 0) if (update_db_info(conn) != 0)
goto connect_errReturn; goto connect_errReturn;
#endif
/* Ensure our buffers are empty */ /* Ensure our buffers are empty */
conn->inStart = conn->inCursor = conn->inEnd = 0; conn->inStart = conn->inCursor = conn->inEnd = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment