The err() bug creeped back in again...

scrappy · scrappy · commit 0b62293b7134 · 1996-08-19T18:04:44.000Z
Pointed out by:  brianc@saintjoe.edu
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
@@ -7,7 +7,7 @@
  * Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.4.2.1 1996/08/17 07:50:21 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.4.2.2 1996/08/19 18:04:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -187,15 +187,11 @@ typedef void (*sig_func)();
  *	error handling / abort routines
  * ----------------
  */
-# if !defined(PORTNAME_BSD44_derived) && \
-     !defined(PORTNAME_bsdi) && \
-     !defined(PORTNAME_bsdi_2_1)
-void err()
+void err_out()
 {
     Warnings++;
     cleanup();
 }
-#endif
 
 /* usage:
    usage help for the bootstrap backen

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.4.2.1 1996/08/17 07:50:21 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.4.2.2 1996/08/19 18:04:44 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -187,15 +187,11 @@ typedef void (*sig_func)();`
`187`	`187`	`* error handling / abort routines`
`188`	`188`	`* ----------------`
`189`	`189`	`*/`
`190`		`-# if !defined(PORTNAME_BSD44_derived) && \`
`191`		`- !defined(PORTNAME_bsdi) && \`
`192`		`- !defined(PORTNAME_bsdi_2_1)`
`193`		`-void err()`
	`190`	`+void err_out()`
`194`	`191`	`{`
`195`	`192`	`Warnings++;`
`196`	`193`	`cleanup();`
`197`	`194`	`}`
`198`		`-#endif`
`199`	`195`
`200`	`196`	`/* usage:`
`201`	`197`	`usage help for the bootstrap backen`