Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit9b7eb28

Browse files
committed
Fixes:
There is a support routine in the standard 4.4BSD C librarycalled "err()". There is also a utility routine in.../src/backend/bootstrap/bootstrap.cwith the same name.Here's a patch that renames the pg95 routine to something a littlemore sane. As a bonus, one more bit of system-specific code leavesthe system...Submitted by: "Kurt J. Lidl" <lidl@va.pubnix.com>
1 parent5bd4485 commit9b7eb28

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

‎src/backend/bootstrap/bootparse.y‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* 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 $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -175,7 +175,7 @@ InsertStmt:
175175
elog(WARN,"incorrect number of values for tuple");
176176
if (reldesc == (Relation)NULL) {
177177
elog(WARN,"must OPEN RELATION before INSERT\n");
178-
err();
178+
err_out();
179179
}
180180
if (DebugMode)
181181
puts("Insert Begin");

‎src/backend/bootstrap/bootstrap.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* Copyright (c) 1994, Regents of the University of California
88
*
99
* 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 $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -187,15 +187,11 @@ typedef void (*sig_func)();
187187
*error handling / abort routines
188188
* ----------------
189189
*/
190-
# if !defined(PORTNAME_BSD44_derived)&& \
191-
!defined(PORTNAME_bsdi)&& \
192-
!defined(PORTNAME_bsdi_2_1)
193-
voiderr()
190+
voiderr_out()
194191
{
195192
Warnings++;
196193
cleanup();
197194
}
198-
#endif
199195

200196
/* usage:
201197
usage help for the bootstrap backen

‎src/backend/bootstrap/bootstrap.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* Copyright (c) 1994, Regents of the University of California
88
*
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 $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -54,7 +54,7 @@ extern void index_register(char *heap,
5454
FuncIndexInfo*finfo,
5555
PredInfo*predInfo);
5656

57-
externvoiderr(void);
57+
externvoiderr_out(void);
5858
externvoidInsertOneTuple(Oidobjectid);
5959
externvoidcloserel(char*name);
6060
externvoidboot_openrel(char*name);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp