rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes: 

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" <lidl@va.pubnix.com>
This commit is contained in:
Marc G. Fournier 1996-08-13 01:28:29 +00:00
parent 5bd4485c8e
commit 9b7eb28ea5
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/bootstrap/bootparse.y
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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"); elog(WARN,"incorrect number of values for tuple");
if (reldesc == (Relation)NULL) { if (reldesc == (Relation)NULL) {
elog(WARN,"must OPEN RELATION before INSERT\n"); elog(WARN,"must OPEN RELATION before INSERT\n");
err(); err_out();
} }
if (DebugMode) if (DebugMode)
puts("Insert Begin"); puts("Insert Begin");

8
src/backend/bootstrap/bootstrap.c
View File

@ -7,7 +7,7 @@
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* IDENTIFICATION * 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 * error handling / abort routines
* ---------------- * ----------------
*/ */
# if !defined(PORTNAME_BSD44_derived) && \ void err_out()
!defined(PORTNAME_bsdi) && \
!defined(PORTNAME_bsdi_2_1)
void err()
{ {
Warnings++; Warnings++;
cleanup(); cleanup();
} }
#endif
/* usage: /* usage:
usage help for the bootstrap backen usage help for the bootstrap backen

4
src/backend/bootstrap/bootstrap.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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, FuncIndexInfo *finfo,
PredInfo *predInfo); PredInfo *predInfo);
extern void err(void); extern void err_out(void);
extern void InsertOneTuple(Oid objectid); extern void InsertOneTuple(Oid objectid);
extern void closerel(char *name); extern void closerel(char *name);
extern void boot_openrel(char *name); extern void boot_openrel(char *name);