aboutsummaryrefslogtreecommitdiff
path: root/src/backend/libpq/pqcomm.c
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-06-04 01:44:38 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-06-04 01:44:38 +0000
commit209aa77d98d8d44b329e942e6f15aec1284db2ca (patch)
treed68949ba2f6d558aae721aca8bfd35de4cfdb387 /src/backend/libpq/pqcomm.c
parent2ea370a3ceea5f3a30df709dea08c41c1f19e486 (diff)
downloadpostgresql-209aa77d98d8d44b329e942e6f15aec1284db2ca.tar.gz
postgresql-209aa77d98d8d44b329e942e6f15aec1284db2ca.zip
New ps display code, works on more platforms.
Install a default configuration file. Clean up some funny business in the config file code.
Diffstat (limited to 'src/backend/libpq/pqcomm.c')
-rw-r--r--src/backend/libpq/pqcomm.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 44c1dd91a01..cc2d0c27548 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -29,7 +29,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: pqcomm.c,v 1.94 2000/06/02 15:57:21 momjian Exp $
+ * $Id: pqcomm.c,v 1.95 2000/06/04 01:44:30 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -182,12 +182,11 @@ StreamDoUnlink()
*/
int
-StreamServerPort(char *hostName, unsigned short portName, int *fdP)
+StreamServerPort(int family, unsigned short portName, int *fdP)
{
SockAddr saddr;
int fd,
- err,
- family;
+ err;
size_t len;
int one = 1;
@@ -196,7 +195,7 @@ StreamServerPort(char *hostName, unsigned short portName, int *fdP)
#endif
- family = ((hostName != NULL) ? AF_INET : AF_UNIX);
+ Assert(family == AF_INET || family == AF_UNIX);
if ((fd = socket(family, SOCK_STREAM, 0)) < 0)
{