Fixes:

scrappy · scrappy · commit 9b7eb28ea5eb · 1996-08-13T01:28:29.000Z
There is a support routine in the standard 4.4BSD C library
called "err()".  There is also a utility routine in
.../src/backend/bootstrap/bootstrap.c
with the same name.

Here's a patch that renames the pg95 routine to something a little
more sane.  As a bonus, one more bit of system-specific code leaves
the system...

Submitted by: "Kurt J. Lidl" &lt;lidl@va.pubnix.com&gt;
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.1.1.1 1996/07/09 06:21:14 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.2 1996/08/13 01:28:27 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -175,7 +175,7 @@ InsertStmt:
 		        elog(WARN,"incorrect number of values for tuple");
 		    if (reldesc == (Relation)NULL) {
 		        elog(WARN,"must OPEN RELATION before INSERT\n");
-		        err();
+		        err_out();
 		    }
 		    if (DebugMode)
 			puts("Insert Begin");
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 1996/07/23 02:23:05 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.5 1996/08/13 01:28:28 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
diff --git a/src/backend/bootstrap/bootstrap.h b/src/backend/bootstrap/bootstrap.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: bootstrap.h,v 1.1.1.1 1996/07/09 06:21:14 scrappy Exp $
+ * $Id: bootstrap.h,v 1.2 1996/08/13 01:28:29 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,7 +54,7 @@ extern void index_register(char *heap,
 			   FuncIndexInfo *finfo,
 			   PredInfo *predInfo);
 
-extern void err(void);
+extern void err_out(void);
 extern void InsertOneTuple(Oid objectid);
 extern void closerel(char *name);
 extern void boot_openrel(char *name);

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.1.1.1 1996/07/09 06:21:14 scrappy Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootparse.y,v 1.2 1996/08/13 01:28:27 scrappy Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -175,7 +175,7 @@ InsertStmt:`
`175`	`175`	`elog(WARN,"incorrect number of values for tuple");`
`176`	`176`	`if (reldesc == (Relation)NULL) {`
`177`	`177`	`elog(WARN,"must OPEN RELATION before INSERT\n");`
`178`		`- err();`
	`178`	`+ err_out();`
`179`	`179`	`}`
`180`	`180`	`if (DebugMode)`
`181`	`181`	`puts("Insert Begin");`
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 1996/07/23 02:23:05 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/bootstrap/bootstrap.c,v 1.5 1996/08/13 01:28:28 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`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: bootstrap.h,v 1.1.1.1 1996/07/09 06:21:14 scrappy Exp $`
	`9`	`+ * $Id: bootstrap.h,v 1.2 1996/08/13 01:28:29 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -54,7 +54,7 @@ extern void index_register(char *heap,`
`54`	`54`	`FuncIndexInfo *finfo,`
`55`	`55`	`PredInfo *predInfo);`
`56`	`56`
`57`		`-extern void err(void);`
	`57`	`+extern void err_out(void);`
`58`	`58`	`extern void InsertOneTuple(Oid objectid);`
`59`	`59`	`extern void closerel(char *name);`
`60`	`60`	`extern void boot_openrel(char *name);`