Remove more (void) and fix -Wall warnings.

6 files changed, 53 insertions, 53 deletions

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index f325fa0a06a..b1c747b4e45 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.12 1997/08/12 20:15:17 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.13 1997/08/12 22:52:45 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -174,7 +174,7 @@ pg_krb4_recvauth(int sock,
 			  key_sched,
 			  version);
     if (status != KSUCCESS) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb4_recvauth: kerberos error: %s\n",
 		       krb_err_txt[status]);
 	fputs(PQerrormsg, stderr);
@@ -182,7 +182,7 @@ pg_krb4_recvauth(int sock,
 	return(STATUS_ERROR);
     }
     if (strncmp(version, PG_KRB4_VERSION, KRB_SENDAUTH_VLEN)) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb4_recvauth: protocol version != \"%s\"\n",
 		       PG_KRB4_VERSION);
 	fputs(PQerrormsg, stderr);
@@ -191,7 +191,7 @@ pg_krb4_recvauth(int sock,
     }
     if (username && *username &&
 	strncmp(username, auth_data.pname, NAMEDATALEN)) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb4_recvauth: name \"%s\" != \"%s\"\n",
 		       username,
 		       auth_data.pname);
@@ -211,7 +211,7 @@ pg_krb4_recvauth(int sock,
 		 struct sockaddr_in *raddr,
 		 char *username)
 {
-  (void) sprintf(PQerrormsg,
+  sprintf(PQerrormsg,
                  "pg_krb4_recvauth: Kerberos not implemented on this "
                  "server.\n");
   fputs(PQerrormsg, stderr);
@@ -309,7 +309,7 @@ pg_krb5_recvauth(int sock,
     if (hostp = strchr(hostp, '.'))
 	*hostp = '\0';
     if (code = krb5_parse_name(servbuf, &server)) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb5_recvauth: Kerberos error %d in krb5_parse_name\n",
 		       code);
 	com_err("pg_krb5_recvauth", code, "in krb5_parse_name");
@@ -341,7 +341,7 @@ pg_krb5_recvauth(int sock,
 			     &client,
 			     (krb5_ticket **) NULL,
 			     (krb5_authenticator **) NULL)) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb5_recvauth: Kerberos error %d in krb5_recvauth\n",
 		       code);
 	com_err("pg_krb5_recvauth", code, "in krb5_recvauth");
@@ -356,7 +356,7 @@ pg_krb5_recvauth(int sock,
      * postmaster startup packet.
      */
     if ((code = krb5_unparse_name(client, &kusername))) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb5_recvauth: Kerberos error %d in krb5_unparse_name\n",
 		       code);
 	com_err("pg_krb5_recvauth", code, "in krb5_unparse_name");
@@ -365,7 +365,7 @@ pg_krb5_recvauth(int sock,
     }
     krb5_free_principal(client);
     if (!kusername) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb5_recvauth: could not decode username\n");
 	fputs(PQerrormsg, stderr);
 	pqdebug("%s", PQerrormsg);
@@ -373,7 +373,7 @@ pg_krb5_recvauth(int sock,
     }
     kusername = pg_an_to_ln(kusername);
     if (username && strncmp(username, kusername, NAMEDATALEN)) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "pg_krb5_recvauth: name \"%s\" != \"%s\"\n",
 		       username, kusername);
 	fputs(PQerrormsg, stderr);
@@ -395,7 +395,7 @@ pg_krb5_recvauth(int sock,
 		 struct sockaddr_in *raddr,
 		 char *username)
 {
-  (void) sprintf(PQerrormsg,
+  sprintf(PQerrormsg,
                  "pg_krb5_recvauth: Kerberos not implemented on this "
                  "server.\n");
   fputs(PQerrormsg, stderr);
@@ -448,14 +448,14 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
 
 
     if (!username) {
-        (void) sprintf(PQerrormsg,
+        sprintf(PQerrormsg,
                        "be_recvauth: no user name passed\n");
         fputs(PQerrormsg, stderr);
         pqdebug("%s", PQerrormsg);
         return(STATUS_ERROR);
     }
     if (!port) {
-        (void) sprintf(PQerrormsg,
+        sprintf(PQerrormsg,
         "be_recvauth: no port structure passed\n");
         fputs(PQerrormsg, stderr);
         pqdebug("%s", PQerrormsg);
@@ -465,7 +465,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
     switch (msgtype) {
     case STARTUP_KRB4_MSG:
         if (!be_getauthsvc(msgtype)) {
-            (void) sprintf(PQerrormsg,
+            sprintf(PQerrormsg,
                            "be_recvauth: krb4 authentication disallowed\n");
             fputs(PQerrormsg, stderr);
             pqdebug("%s", PQerrormsg);
@@ -473,7 +473,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
         }
 	if (pg_krb4_recvauth(port->sock, &port->laddr, &port->raddr,
                              username) != STATUS_OK) {
-            (void) sprintf(PQerrormsg,
+            sprintf(PQerrormsg,
                            "be_recvauth: krb4 authentication failed\n");
             fputs(PQerrormsg, stderr);
             pqdebug("%s", PQerrormsg);
@@ -482,7 +482,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
 	break;
     case STARTUP_KRB5_MSG:
         if (!be_getauthsvc(msgtype)) {
-            (void) sprintf(PQerrormsg,
+            sprintf(PQerrormsg,
                            "be_recvauth: krb5 authentication disallowed\n");
             fputs(PQerrormsg, stderr);
             pqdebug("%s", PQerrormsg);
@@ -490,7 +490,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
           }
         if (pg_krb5_recvauth(port->sock, &port->laddr, &port->raddr,
                              username) != STATUS_OK) {
-            (void) sprintf(PQerrormsg,
+            sprintf(PQerrormsg,
                            "be_recvauth: krb5 authentication failed\n");
             fputs(PQerrormsg, stderr);
             pqdebug("%s", PQerrormsg);
@@ -499,7 +499,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
         break;
     case STARTUP_UNAUTH_MSG:
         if (!be_getauthsvc(msgtype)) {
-            (void) sprintf(PQerrormsg,
+            sprintf(PQerrormsg,
                            "be_recvauth: "
                            "unauthenticated connections disallowed\n");
             fputs(PQerrormsg, stderr);
@@ -509,7 +509,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
         break;
     case STARTUP_HBA_MSG:
         if (hba_recvauth(port, sp->database, sp->user, DataDir) != STATUS_OK) {
-            (void) sprintf(PQerrormsg,
+            sprintf(PQerrormsg,
                            "be_recvauth: host-based authentication failed\n");
             fputs(PQerrormsg, stderr);
             pqdebug("%s", PQerrormsg);
@@ -532,7 +532,7 @@ be_recvauth(MsgType msgtype_arg, Port *port, char *username, StartupInfo* sp)
 	}
 	break;
     default:
-        (void) sprintf(PQerrormsg,
+        sprintf(PQerrormsg,
                        "be_recvauth: unrecognized message type: %d\n",
                        msgtype);
         fputs(PQerrormsg, stderr);
@@ -577,7 +577,7 @@ be_setauthsvc(char *name)
 	    break;
 	}
     if (i == n_authsvcs) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "be_setauthsvc: invalid name %s, ignoring...\n",
 		       name);
 	fputs(PQerrormsg, stderr);
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index c1b36b88948..58a827838db 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.11 1997/08/12 20:15:18 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/be-fsstubs.c,v 1.12 1997/08/12 22:52:48 momjian Exp $
  *
  * NOTES
  *    This should be moved to a more appropriate place.  It is here
@@ -290,8 +290,8 @@ lo_import(text *filename)
 	}
     }
 
-    (void) close(fd);
-    (void) inv_close(lobj);
+    close(fd);
+    inv_close(lobj);
 
     return lobjOid;
 }
@@ -326,7 +326,7 @@ lo_export(Oid lobjId, text *filename)
     oumask = umask((mode_t) 0);
     strNcpy(fnamebuf, VARDATA(filename), VARSIZE(filename) - VARHDRSZ);
     fd = open(fnamebuf, O_CREAT|O_WRONLY, 0666);
-    (void) umask(oumask);
+    umask(oumask);
     if (fd < 0)  {   /* error */
 	elog(WARN, "lo_export: can't open unix file\"%s\"",
 	     fnamebuf);
@@ -343,8 +343,8 @@ lo_export(Oid lobjId, text *filename)
 	}
     }
 
-    (void) inv_close(lobj);
-    (void) close(fd);
+    inv_close(lobj);
+    close(fd);
 
     return 1;
 }
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 22d532bf537..fd1da79c11f 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.16 1997/03/12 21:17:53 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.17 1997/08/12 22:52:52 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -64,7 +64,7 @@ next_token(FILE *fp, char *buf, const int bufsz) {
       c = getc(fp);
       /* Put back the char right after the token (putting back EOF is ok) */
     } 
-    (void) ungetc(c, fp);
+    ungetc(c, fp);
   }
   *buf = '\0';
 }
diff --git a/src/backend/libpq/portal.c b/src/backend/libpq/portal.c
index 2ddeab1a701..301773be9f5 100644
--- a/src/backend/libpq/portal.c
+++ b/src/backend/libpq/portal.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.5 1997/08/12 20:15:22 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/portal.c,v 1.6 1997/08/12 22:52:55 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -74,7 +74,7 @@ static int
 in_range(char *msg, int value, int min, int max)
 {
     if (value < min || value >= max) {
-	(void) sprintf(PQerrormsg, "FATAL: %s, %d is not in range [%d,%d)\n",
+	sprintf(PQerrormsg, "FATAL: %s, %d is not in range [%d,%d)\n",
 		       msg, value, min, max);
 	pqdebug("%s", PQerrormsg);
 	fputs(PQerrormsg, stderr);
@@ -87,7 +87,7 @@ static int
 valid_pointer(char *msg, void *ptr)
 {
     if (!ptr) {
-	(void) sprintf(PQerrormsg, "FATAL: %s\n", msg);
+	sprintf(PQerrormsg, "FATAL: %s\n", msg);
 	pqdebug("%s", PQerrormsg);
 	fputs(PQerrormsg, stderr);
 	return(0);
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 78767a4a1c4..cfa0aebc521 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.18 1997/08/12 20:15:24 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/pqcomm.c,v 1.19 1997/08/12 22:52:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -243,7 +243,7 @@ int
 PQputline(char *s)
 {
     if (Pfout) {
-	(void) fputs(s, Pfout);
+	fputs(s, Pfout);
 	fflush(Pfout);
     }
     return(0);
@@ -314,7 +314,7 @@ pq_getint(int b)
     
     if(status)
     	{
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
     	    "FATAL: pq_getint failed: errno=%d\n", errno);
     	fputs(PQerrormsg, stderr);
     	pqdebug("%s", PQerrormsg);
@@ -333,7 +333,7 @@ pq_putstr(char *s)
 {
 	if(pqPutString(s, Pfout))
 		{
-	    (void) sprintf(PQerrormsg,
+	    sprintf(PQerrormsg,
 			"FATAL: pq_putstr: fputs() failed: errno=%d\n", errno);
 	    fputs(PQerrormsg, stderr);
 	    pqdebug("%s", PQerrormsg);
@@ -349,7 +349,7 @@ pq_putnchar(char *s, int n)
 	{
 	if(pqPutNBytes(s, n, Pfout))
 		{	
-		(void) sprintf(PQerrormsg,
+		sprintf(PQerrormsg,
 			       "FATAL: pq_putnchar: fputc() failed: errno=%d\n",
 			       errno);
 		fputs(PQerrormsg, stderr);
@@ -389,7 +389,7 @@ pq_putint(int i, int b)
 
     if(status)
     	{
-		(void) sprintf(PQerrormsg,
+		sprintf(PQerrormsg,
     	    "FATAL: pq_putint failed: errno=%d\n", errno);
 		fputs(PQerrormsg, stderr);
 		pqdebug("%s", PQerrormsg);
@@ -444,7 +444,7 @@ pq_getinaddr(struct sockaddr_in *sin,
 		return(1);
 	    }
 	    if (hs->h_addrtype != AF_INET) {
-		(void) sprintf(PQerrormsg,
+		sprintf(PQerrormsg,
 			       "FATAL: pq_getinaddr: %s not on Internet\n",
 			       host);
 		fputs(PQerrormsg, stderr);
@@ -473,7 +473,7 @@ pq_getinserv(struct sockaddr_in *sin, char *host, char *serv)
     if (*serv >= '0' && *serv <= '9')
 	return(pq_getinaddr(sin, host, atoi(serv)));
     if (!(ss = getservbyname(serv, NULL))) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: pq_getinserv: unknown service: %s\n",
 		       serv);
 	fputs(PQerrormsg, stderr);
@@ -498,7 +498,7 @@ pq_regoob(void (*fptr)())
 #else
     fcntl(fd, F_SETOWN, getpid());
 #endif /* hpux */
-    (void) pqsignal(SIGURG,fptr);
+    pqsignal(SIGURG,fptr);
 }
 
 void
@@ -559,7 +559,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
     memset((char *)&sin, 0, sizeof sin);
     
     if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: StreamServerPort: socket() failed: errno=%d\n",
 		       errno);
 	fputs(PQerrormsg, stderr);
@@ -569,7 +569,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
 
     if((setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&one,
                                                     sizeof(one))) == -1) {
-        (void) sprintf(PQerrormsg,
+        sprintf(PQerrormsg,
             "FATAL: StreamServerPort: setsockopt (SO_REUSEADDR) failed: errno=%d\n",
             errno);
 	fputs(PQerrormsg, stderr);
@@ -581,7 +581,7 @@ StreamServerPort(char *hostName, short portName, int *fdP)
     sin.sin_port = htons(portName);
     
     if (bind(fd, (struct sockaddr *)&sin, sizeof sin) < 0) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: StreamServerPort: bind() failed: errno=%d\n",
 		       errno);
 	pqdebug("%s", PQerrormsg);
@@ -597,8 +597,8 @@ StreamServerPort(char *hostName, short portName, int *fdP)
      * listening port non-blocking.  That is not necessary (and
      * may tickle kernel bugs).
      
-     (void) fcntl(fd, F_SETFD, 1);
-     (void) fcntl(fd, F_SETFL, FNDELAY);
+     fcntl(fd, F_SETFD, 1);
+     fcntl(fd, F_SETFL, FNDELAY);
      */
     
     *fdP = fd;
@@ -666,7 +666,7 @@ StreamConnection(int server_fd, Port *port)
 void
 StreamClose(int sock)
 {
-    (void) close(sock); 
+    close(sock); 
 }
 
 /* ---------------------------
@@ -692,7 +692,7 @@ StreamOpen(char *hostName, short portName, Port *port)
     
     /* set up the server (remote) address */
     if (!(hp = gethostbyname(hostName)) || hp->h_addrtype != AF_INET) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: StreamOpen: unknown hostname: %s\n",
 		       hostName);
 	fputs(PQerrormsg, stderr);
@@ -708,7 +708,7 @@ StreamOpen(char *hostName, short portName, Port *port)
     
     /* connect to the server */
     if ((port->sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: StreamOpen: socket() failed: errno=%d\n",
 		       errno);
 	fputs(PQerrormsg, stderr);
@@ -717,7 +717,7 @@ StreamOpen(char *hostName, short portName, Port *port)
     }
     if (connect(port->sock, (struct sockaddr *)&port->raddr,
 		sizeof(port->raddr)) < 0) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: StreamOpen: connect() failed: errno=%d\n",
 		       errno);
 	fputs(PQerrormsg, stderr);
@@ -728,7 +728,7 @@ StreamOpen(char *hostName, short portName, Port *port)
     /* fill in the client address */
     if (getsockname(port->sock, (struct sockaddr *) &port->laddr,
 		    &laddrlen) < 0) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: StreamOpen: getsockname() failed: errno=%d\n",
 		       errno);
 	fputs(PQerrormsg, stderr);
diff --git a/src/backend/libpq/pqpacket.c b/src/backend/libpq/pqpacket.c
index 5190ec5d884..6f67ddc5f5b 100644
--- a/src/backend/libpq/pqpacket.c
+++ b/src/backend/libpq/pqpacket.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.4 1997/02/14 04:15:31 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/libpq/Attic/pqpacket.c,v 1.5 1997/08/12 22:53:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -214,7 +214,7 @@ PacketSend(Port *port,
 		 (struct sockaddr *)&(port->raddr), addrLen);
     
     if (len < totalLen) {
-	(void) sprintf(PQerrormsg,
+	sprintf(PQerrormsg,
 		       "FATAL: PacketSend: couldn't send complete packet: errno=%d\n",
 		       errno);
 	fputs(PQerrormsg, stderr);