database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-15 19:21:59 +03:00
Code Activity

A few fixups in error handling: mark pg_re_throw() as noreturn for gcc,

Browse Source 
and for other compilers, insert a dummy exit() call so that they understand
PG_RE_THROW() doesn't return.  Insert fflush(stderr) in ExceptionalCondition,
per recent buildfarm evidence that that might not happen automatically on some
platforms.  And const-ify ExceptionalCondition's declaration while at it.
This commit is contained in:
Tom Lane
2007-05-04 02:01:02 +00:00
parent d26559dbf3
commit 79ca7ffeb6
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/include/utils/elog.h
View File

@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.85 2007/05/02 15:32:42 tgl Exp $
* $PostgreSQL: pgsql/src/include/utils/elog.h,v 1.86 2007/05/04 02:01:02 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -222,8 +222,17 @@ extern DLLIMPORT ErrorContextCallback *error_context_stack;
error_context_stack = save_context_stack; \
} while (0)
/*
* gcc understands __attribute__((noreturn)); for other compilers, insert
* a useless exit() call so that the compiler gets the point.
*/
#ifdef __GNUC__
#define PG_RE_THROW() \
pg_re_throw()
#else
#define PG_RE_THROW() \
(pg_re_throw(), exit(1))
#endif
extern DLLIMPORT sigjmp_buf *PG_exception_stack;
@ -262,7 +271,7 @@ extern ErrorData *CopyErrorData(void);
extern void FreeErrorData(ErrorData *edata);
extern void FlushErrorState(void);
extern void ReThrowError(ErrorData *edata);
extern void pg_re_throw(void);
extern void pg_re_throw(void) __attribute__((noreturn));
/* GUC-configurable parameters */