4 files changed, 10 insertions, 12 deletions
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index af367295828..b923028b5fa 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.10 1998/08/25 21:34:06 scrappy Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/assert.c,v 1.11 1998/09/01 03:26:35 momjian Exp $
  *
  * NOTE
  *	  This should eventually work with elog(), dlog(), etc.
@@ -72,5 +72,5 @@ ExceptionalCondition(char *conditionName,
 
 	/* XXX FIXME: detail is lost */
 	ExcRaise(exceptionP, (ExcDetail) 0, (ExcData) NULL, conditionName);
-	return (0);
+	return 0;
 }
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index ec300acdab8..79ae7e81379 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.33 1998/08/31 04:48:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.34 1998/09/01 03:26:37 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -52,8 +52,6 @@ static int	Debugfile = -1;
 static int	Err_file = -1;
 static int	ElogDebugIndentLevel = 0;
 
-extern char OutputFileName[];
-
 /*
  * elog --
  *		Old error logging function.
@@ -287,7 +285,7 @@ DebugFileOpen(void)
 			elog(FATAL, "DebugFileOpen: %s reopen as stderr: %m",
 				 OutputFileName);
 		Err_file = Debugfile = fileno(stderr);
-		return (Debugfile);
+		return Debugfile;
 	}
 
 	/*
@@ -305,7 +303,7 @@ DebugFileOpen(void)
 		elog(FATAL, "DebugFileOpen: could not open debugging file");
 
 	Err_file = Debugfile = fd;
-	return (Debugfile);
+	return Debugfile;
 }
 
 #endif
diff --git a/src/backend/utils/error/exc.c b/src/backend/utils/error/exc.c
index 70af54af127..3061edcc317 100644
--- a/src/backend/utils/error/exc.c
+++ b/src/backend/utils/error/exc.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.21 1998/06/27 04:53:45 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/exc.c,v 1.22 1998/09/01 03:26:38 momjian Exp $
  *
  * NOTE
  *	  XXX this code needs improvement--check for state violations and
@@ -144,7 +144,7 @@ ExcPrint(Exception *excP,
 ExcProc    *
 ExcGetUnCaught(void)
 {
-	return (ExcUnCaughtP);
+	return ExcUnCaughtP;
 }
 
 #endif
@@ -157,7 +157,7 @@ ExcSetUnCaught(ExcProc *newP)
 
 	ExcUnCaughtP = newP;
 
-	return (oldP);
+	return oldP;
 }
 
 #endif
diff --git a/src/backend/utils/error/format.c b/src/backend/utils/error/format.c
index e76f78cbca9..7c3661da4bd 100644
--- a/src/backend/utils/error/format.c
+++ b/src/backend/utils/error/format.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.6 1998/02/26 04:37:36 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/error/Attic/format.c,v 1.7 1998/09/01 03:26:40 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -36,5 +36,5 @@ form(const char *fmt,...)
 
 	va_end(args);
 
-	return (FormBuf);
+	return FormBuf;
 }