Renaming cleanup, no pgindent yet.

src/backend/port/dynloader/bsd.c

@@ -55,7 +55,7 @@ BSD44_derived_dlerror(void)
 
 	strcpy(ret, error_message);
 	error_message[0] = 0;
-	return ((ret[0] == 0) ? (char *) NULL : ret);
+	return (ret[0] == 0) ? (char *) NULL : ret;
 }
 
 void *
@@ -69,7 +69,7 @@ BSD44_derived_dlopen(const char *file, int num)
 
 	if ((vp = dlopen((char *) file, num)) == (void *) NULL)
 		sprintf(error_message, "dlopen (%s) failed", file);
-	return (vp);
+	return vp;
 #endif
 }
 
@@ -90,7 +90,7 @@ BSD44_derived_dlsym(void *handle, const char *name)
 	}
 	if ((vp = dlsym(handle, (char *) name)) == (void *) NULL)
 		sprintf(error_message, "dlsym (%s) failed", name);
-	return (vp);
+	return vp;
 #endif
 }
 

src/backend/port/dynloader/bsdi.c

@@ -22,7 +22,7 @@
 #include "utils/elog.h"
 #include "fmgr.h"
 
-extern char pg_pathname[];
+extern char *pg_pathname;
 
 void *
 pg_dlopen(char *filename)

src/backend/port/dynloader/hpux.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.4 1998/06/15 19:28:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/hpux.c,v 1.5 1998/09/01 03:24:39 momjian Exp $
  *
  *	NOTES
  *		all functions are defined here -- it's impossible to trace the
@@ -29,7 +29,7 @@ pg_dlopen(char *filename)
 {
 	shl_t		handle = shl_load(filename, BIND_DEFERRED, 0);
 
-	return ((void *) handle);
+	return (void *) handle;
 }
 
 func_ptr
@@ -39,7 +39,7 @@ pg_dlsym(void *handle, char *funcname)
 
 	if (shl_findsym((shl_t *) & handle, funcname, TYPE_PROCEDURE, &f) == -1)
 		f = (func_ptr) NULL;
-	return (f);
+	return f;
 }
 
 void

src/backend/port/dynloader/linux.c

@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.8 1998/06/15 19:28:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/linux.c,v 1.9 1998/09/01 03:24:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -26,14 +26,14 @@
 #include "fmgr.h"
 
 #if FALSE
-extern char pg_pathname[];
+extern char *pg_pathname;
 
 void *
 pg_dlopen(char *filename)
 {
 #ifndef HAVE_DLD_H
 	elog(ERROR, "dynamic load not supported");
-	return (NULL);
+	return NULL;
 #else
 	static int	dl_initialized = 0;
 
@@ -106,7 +106,7 @@ char *
 pg_dlerror()
 {
 #ifndef HAVE_DLD_H
-	return ("dynaloader unspported");
+	return "dynaloader unspported";
 #else
 	return dld_strerror(dld_errno);
 #endif

src/backend/port/dynloader/ultrix4.c

@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.2 1998/06/15 19:28:59 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/port/dynloader/ultrix4.c,v 1.3 1998/09/01 03:24:41 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -22,7 +22,7 @@
 #include "port-protos.h"
 #include "utils/elog.h"
 
-extern char pg_pathname[];
+extern char *pg_pathname;
 
 void *
 pg_dlopen(char *filename)

src/backend/port/gethostname.c

@@ -1,4 +1,4 @@
-/* $Id: gethostname.c,v 1.3 1998/01/15 20:54:34 scrappy Exp $ */
+/* $Id: gethostname.c,v 1.4 1998/09/01 03:24:25 momjian Exp $ */
 
 #include <sys/types.h>
 #include <string.h>
@@ -20,5 +20,5 @@ gethostname(char *name, int namelen)
 	}
 	strncpy(name, mname.nodename, (SYS_NMLN < namelen ? SYS_NMLN : namelen));
 
-	return (0);
+	return 0;
 }

src/backend/port/getrusage.c

@@ -1,4 +1,4 @@
-/* $Id: getrusage.c,v 1.9 1998/07/13 16:39:07 momjian Exp $ */
+/* $Id: getrusage.c,v 1.10 1998/09/01 03:24:26 momjian Exp $ */
 
 #include <errno.h>
 #include "rusagestub.h"
@@ -26,12 +26,12 @@ getrusage(int who, struct rusage * rusage)
 	if (rusage == (struct rusage *) NULL)
 	{
 		errno = EFAULT;
-		return (-1);
+		return -1;
 	}
 	if (times(&tms) < 0)
 	{
 		/* errno set by times */
-		return (-1);
+		return -1;
 	}
 	switch (who)
 	{
@@ -45,7 +45,7 @@ getrusage(int who, struct rusage * rusage)
 			break;
 		default:
 			errno = EINVAL;
-			return (-1);
+			return -1;
 	}
 #define TICK_TO_SEC(T, RATE)	((T)/(RATE))
 #define TICK_TO_USEC(T,RATE)	(((T)%(RATE)*1000000)/RATE)
@@ -53,5 +53,5 @@ getrusage(int who, struct rusage * rusage)
 	rusage->ru_utime.tv_usec = TICK_TO_USEC(u, tick_rate);
 	rusage->ru_stime.tv_sec = TICK_TO_SEC(s, tick_rate);
 	rusage->ru_stime.tv_usec = TICK_TO_USEC(u, tick_rate);
-	return (0);
+	return 0;
 }

src/backend/port/inet_aton.c

@@ -1,4 +1,4 @@
-/* $Id: inet_aton.c,v 1.14 1998/02/26 04:34:04 momjian Exp $
+/* $Id: inet_aton.c,v 1.15 1998/09/01 03:24:28 momjian Exp $
  *
  *	This inet_aton() function was taken from the GNU C library and
  *	incorporated into Postgres for those systems which do not have this
@@ -104,7 +104,7 @@ inet_aton(const char *cp, struct in_addr * addr)
 			 * 16-bits) a.b		(with b treated as 24 bits)
 			 */
 			if (pp >= parts + 3 || val > 0xff)
-				return (0);
+				return 0;
 			*pp++ = val, cp++;
 		}
 		else
@@ -115,7 +115,7 @@ inet_aton(const char *cp, struct in_addr * addr)
 	 * Check for trailing characters.
 	 */
 	if (*cp && (!isascii(*cp) || !isspace(*cp)))
-		return (0);
+		return 0;
 
 	/*
 	 * Concoct the address according to the number of parts specified.
@@ -129,23 +129,23 @@ inet_aton(const char *cp, struct in_addr * addr)
 
 		case 2:			/* a.b -- 8.24 bits */
 			if (val > 0xffffff)
-				return (0);
+				return 0;
 			val |= parts[0] << 24;
 			break;
 
 		case 3:			/* a.b.c -- 8.8.16 bits */
 			if (val > 0xffff)
-				return (0);
+				return 0;
 			val |= (parts[0] << 24) | (parts[1] << 16);
 			break;
 
 		case 4:			/* a.b.c.d -- 8.8.8.8 bits */
 			if (val > 0xff)
-				return (0);
+				return 0;
 			val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
 			break;
 	}
 	if (addr)
 		addr->s_addr = htonl(val);
-	return (1);
+	return 1;
 }

src/backend/port/isinf.c

@@ -1,4 +1,4 @@
-/* $Id: isinf.c,v 1.5 1998/03/01 04:53:54 scrappy Exp $ */
+/* $Id: isinf.c,v 1.6 1998/09/01 03:24:29 momjian Exp $ */
 
 #include <math.h>
 #include "config.h"
@@ -16,11 +16,11 @@ isinf(double d)
 	{
 		case FP_NINF:
 		case FP_PINF:
-			return (1);
+			return 1;
 		default:
 			break;
 	}
-	return (0);
+	return 0;
 }
 
 #else
@@ -42,10 +42,10 @@ double		x;
 #endif
 
 	if (fpclass == FP_POS_INF)
-		return (1);
+		return 1;
 	if (fpclass == FP_NEG_INF)
-		return (-1);
-	return (0);
+		return -1;
+	return 0;
 }
 
 #endif
@@ -58,10 +58,10 @@ isinf(double x)
 	int			fpclass = class(x);
 
 	if (fpclass == FP_PLUS_INF)
-		return (1);
+		return 1;
 	if (fpclass == FP_MINUS_INF)
-		return (-1);
-	return (0);
+		return -1;
+	return 0;
 }
 
 #endif

src/backend/port/nextstep/port.c

@@ -47,7 +47,7 @@ sigaddset(int *set, int signo)
 int
 sigemptyset(int *set)
 {
-	return (*set = 0);
+	return *set = 0;
 }
 
 char *

src/backend/port/random.c

@@ -1,4 +1,4 @@
-/* $Id: random.c,v 1.4 1998/02/26 04:34:11 momjian Exp $ */
+/* $Id: random.c,v 1.5 1998/09/01 03:24:30 momjian Exp $ */
 
 #include <math.h>				/* for pow() prototype */
 
@@ -8,5 +8,5 @@
 long
 random()
 {
-	return (lrand48());
+	return lrand48();
 }

src/backend/port/snprintf.c

@@ -39,7 +39,7 @@
 static char sccsid[] = "@(#)snprintf.c	8.1 (Berkeley) 6/4/93";
 #endif
 static const char rcsid[] =
-		"$Id: snprintf.c,v 1.1 1998/08/01 19:30:28 scrappy Exp $";
+		"$Id: snprintf.c,v 1.2 1998/09/01 03:24:31 momjian Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <limits.h>
@@ -85,5 +85,5 @@ snprintf(str, n, fmt, va_alist)
 	if (on > 0)
 		*f._p = '\0';
 	va_end(ap);
-	return (ret);
+	return ret;
 }

src/backend/port/strerror.c

@@ -1,4 +1,4 @@
-/* $Id: strerror.c,v 1.4 1997/12/19 13:34:32 scrappy Exp $ */
+/* $Id: strerror.c,v 1.5 1998/09/01 03:24:33 momjian Exp $ */
 
 /*
  * strerror - map error number to descriptive string
@@ -24,8 +24,8 @@ strerror(int errnum)
 	if (errnum < 0 || errnum > sys_nerr)
 	{
 		sprintf(buf, "unknown error %d", errnum);
-		return (buf);
+		return buf;
 	}
 
-	return (sys_errlist[errnum]);
+	return sys_errlist[errnum];
 }

src/backend/port/strtol.c

@@ -136,5 +136,5 @@ int			base;
 		acc = -acc;
 	if (endptr != 0)
 		*endptr = any ? s - 1 : (char *) nptr;
-	return (acc);
+	return acc;
 }

src/backend/port/strtoul.c

@@ -116,5 +116,5 @@ register int base;
 		acc = -acc;
 	if (endptr != 0)
 		*endptr = (char *) (any ? s - 1 : nptr);
-	return (acc);
+	return acc;
 }