Clean up gcc warning, fix inappropriate choice of configuration symbol.

tglsfdc · tglsfdc · commit a4566a7a7a95 · 2000-10-05T20:18:33.000Z
diff --git 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.104 2000/10/03 03:11:14 momjian Exp $
+ *	$Id: pqcomm.c,v 1.105 2000/10/05 20:18:33 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -172,12 +172,10 @@ StreamServerPort(int family, unsigned short portName, int *fdP)
 	SockAddr	saddr;
 	int			fd,
 				err;
-	size_t		len;
+	size_t		len = 0;
 	int			one = 1;
-
 #ifdef HAVE_FCNTL_SETLK
 	int			lock_fd;
-
 #endif
 
 	Assert(family == AF_INET || family == AF_UNIX);
@@ -209,11 +207,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)
 	MemSet((char *) &saddr, 0, sizeof(saddr));
 	saddr.sa.sa_family = family;
 
-/* I know this isn't a good way of testing, but until we have a 
- * define for this it'll do!
- * we have Unix sockets... 
- */
-#ifdef HAVE_SYS_UN_H 
+#ifdef HAVE_UNIX_SOCKETS
 	if (family == AF_UNIX)
 	{
 		len = UNIXSOCK_PATH(saddr.un, portName);
@@ -236,7 +230,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)
 		}
 #endif	 /* HAVE_FCNTL_SETLK */
 	}
-#endif /* HAVE_SYS_UN_H */
+#endif /* HAVE_UNIX_SOCKETS */
 
     if (family == AF_INET) 
     {
@@ -266,7 +260,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)
 		return STATUS_ERROR;
 	}
 
-#ifdef HAVE_SYS_UN_H /* yeah I know... */
+#ifdef HAVE_UNIX_SOCKETS
 	if (family == AF_UNIX)
 	{
 		on_proc_exit(StreamDoUnlink, 0);
@@ -288,7 +282,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)
 		}
 #endif	 /* HAVE_FCNTL_SETLK */
 	}
-#endif /* HAVE_SYS_UN_H */
+#endif /* HAVE_UNIX_SOCKETS */
 
 	listen(fd, SOMAXCONN);
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* Portions Copyright (c) 1996-2000, PostgreSQL, Inc`
`30`	`30`	`* Portions Copyright (c) 1994, Regents of the University of California`
`31`	`31`	`*`
`32`		`- * $Id: pqcomm.c,v 1.104 2000/10/03 03:11:14 momjian Exp $`
	`32`	`+ * $Id: pqcomm.c,v 1.105 2000/10/05 20:18:33 tgl Exp $`
`33`	`33`	`*`
`34`	`34`	`*-------------------------------------------------------------------------`
`35`	`35`	`*/`
`@@ -172,12 +172,10 @@ StreamServerPort(int family, unsigned short portName, int *fdP)`
`172`	`172`	`SockAddr saddr;`
`173`	`173`	`int fd,`
`174`	`174`	`err;`
`175`		`- size_t len;`
	`175`	`+ size_t len = 0;`
`176`	`176`	`int one = 1;`
`177`		`-`
`178`	`177`	`#ifdef HAVE_FCNTL_SETLK`
`179`	`178`	`int lock_fd;`
`180`		`-`
`181`	`179`	`#endif`
`182`	`180`
`183`	`181`	`Assert(family == AF_INET \|\| family == AF_UNIX);`
`@@ -209,11 +207,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)`
`209`	`207`	`MemSet((char *) &saddr, 0, sizeof(saddr));`
`210`	`208`	`saddr.sa.sa_family = family;`
`211`	`209`
`212`		`-/* I know this isn't a good way of testing, but until we have a`
`213`		`- * define for this it'll do!`
`214`		`- * we have Unix sockets...`
`215`		`- */`
`216`		`-#ifdef HAVE_SYS_UN_H`
	`210`	`+#ifdef HAVE_UNIX_SOCKETS`
`217`	`211`	`if (family == AF_UNIX)`
`218`	`212`	`{`
`219`	`213`	`len = UNIXSOCK_PATH(saddr.un, portName);`
`@@ -236,7 +230,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)`
`236`	`230`	`}`
`237`	`231`	`#endif /* HAVE_FCNTL_SETLK */`
`238`	`232`	`}`
`239`		`-#endif /* HAVE_SYS_UN_H */`
	`233`	`+#endif /* HAVE_UNIX_SOCKETS */`
`240`	`234`
`241`	`235`	`if (family == AF_INET)`
`242`	`236`	`{`
`@@ -266,7 +260,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)`
`266`	`260`	`return STATUS_ERROR;`
`267`	`261`	`}`
`268`	`262`
`269`		`-#ifdef HAVE_SYS_UN_H /* yeah I know... */`
	`263`	`+#ifdef HAVE_UNIX_SOCKETS`
`270`	`264`	`if (family == AF_UNIX)`
`271`	`265`	`{`
`272`	`266`	`on_proc_exit(StreamDoUnlink, 0);`
`@@ -288,7 +282,7 @@ StreamServerPort(int family, unsigned short portName, int *fdP)`
`288`	`282`	`}`
`289`	`283`	`#endif /* HAVE_FCNTL_SETLK */`
`290`	`284`	`}`
`291`		`-#endif /* HAVE_SYS_UN_H */`
	`285`	`+#endif /* HAVE_UNIX_SOCKETS */`
`292`	`286`
`293`	`287`	`listen(fd, SOMAXCONN);`
`294`	`288`