|
8 | 8 | * |
9 | 9 | * |
10 | 10 | * IDENTIFICATION |
11 | | - * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.150 2000/11/28 06:53:33 momjian Exp $ |
| 11 | + * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.151 2000/11/30 18:32:52 petere Exp $ |
12 | 12 | * |
13 | 13 | *------------------------------------------------------------------------- |
14 | 14 | */ |
@@ -130,9 +130,6 @@ static const PQconninfoOption PQconninfoOptions[] = { |
130 | 130 | {"port","PGPORT",DEF_PGPORT_STR,NULL, |
131 | 131 | "Database-Port","",6}, |
132 | 132 |
|
133 | | -{"unixsocket","PGUNIXSOCKET",NULL,NULL, |
134 | | -"Unix-Socket","",80}, |
135 | | - |
136 | 133 | {"tty","PGTTY",DefaultTty,NULL, |
137 | 134 | "Backend-Debug-TTY","D",40}, |
138 | 135 |
|
@@ -308,8 +305,6 @@ PQconnectStart(const char *conninfo) |
308 | 305 | conn->pghost=tmp ?strdup(tmp) :NULL; |
309 | 306 | tmp=conninfo_getval(connOptions,"port"); |
310 | 307 | conn->pgport=tmp ?strdup(tmp) :NULL; |
311 | | -tmp=conninfo_getval(connOptions,"unixsocket"); |
312 | | -conn->pgunixsocket=tmp ?strdup(tmp) :NULL; |
313 | 308 | tmp=conninfo_getval(connOptions,"tty"); |
314 | 309 | conn->pgtty=tmp ?strdup(tmp) :NULL; |
315 | 310 | tmp=conninfo_getval(connOptions,"options"); |
@@ -402,9 +397,6 @@ PQconndefaults(void) |
402 | 397 | * PGPORT identifies TCP port to which to connect if <pgport> argument |
403 | 398 | * is NULL or a null string. |
404 | 399 | * |
405 | | - * PGUNIXSOCKET identifies Unix-domain socket to which to connect; default |
406 | | - * is computed from the TCP port. |
407 | | - * |
408 | 400 | * PGTTY identifies tty to which to send messages if <pgtty> argument |
409 | 401 | * is NULL or a null string. |
410 | 402 | * |
@@ -541,6 +533,7 @@ PQsetdbLogin(const char *pghost, const char *pgport, const char *pgoptions, |
541 | 533 | } |
542 | 534 |
|
543 | 535 |
|
| 536 | +#ifdefNOT_USED/* because it's broken */ |
544 | 537 | /* |
545 | 538 | * update_db_info - |
546 | 539 | * get all additional info out of dbName |
@@ -689,6 +682,8 @@ update_db_info(PGconn *conn) |
689 | 682 |
|
690 | 683 | return0; |
691 | 684 | } |
| 685 | +#endif/* NOT_USED */ |
| 686 | + |
692 | 687 |
|
693 | 688 | /* ---------- |
694 | 689 | * connectMakeNonblocking - |
@@ -768,11 +763,13 @@ connectDBStart(PGconn *conn) |
768 | 763 | if (!conn) |
769 | 764 | return0; |
770 | 765 |
|
| 766 | +#ifdefNOT_USED |
771 | 767 | /* |
772 | 768 | * parse dbName to get all additional info in it, if any |
773 | 769 | */ |
774 | 770 | if (update_db_info(conn)!=0) |
775 | 771 | gotoconnect_errReturn; |
| 772 | +#endif |
776 | 773 |
|
777 | 774 | /* Ensure our buffers are empty */ |
778 | 775 | conn->inStart=conn->inCursor=conn->inEnd=0; |
|