diff options
author | Marc G. Fournier | 1996-08-13 01:28:29 +0000 |
---|---|---|
committer | Marc G. Fournier | 1996-08-13 01:28:29 +0000 |
commit | 9b7eb28ea5ebdea8ea92944f036b7c0409abd62f (patch) | |
tree | eceb8d8746dca018611d7e92e12f5b67409bce39 | |
parent | 5bd4485c8e4fd1a198af7bd7f254d5ea2330a886 (diff) |
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" <[email protected]>
-rw-r--r-- | src/backend/bootstrap/bootparse.y | 4 | ||||
-rw-r--r-- | src/backend/bootstrap/bootstrap.c | 8 | ||||
-rw-r--r-- | src/backend/bootstrap/bootstrap.h | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y index 0362b302b16..83083e026c1 100644 --- 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 index d8dff690515..2a1832349ab 100644 --- 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 index 8ade7664f1f..3659707d1d2 100644 --- 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); |