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

Change return type of ExceptionalCondition to void and mark it noreturn

Browse Source 
In ancient times, it was thought that this wouldn't work because of
TrapMacro/AssertMacro, but changing those to use a comma operator
appears to work without compiler warnings.
This commit is contained in:
Peter Eisentraut
2012-04-29 21:07:35 +03:00
parent 2227bb9c94
commit 81107282a5
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/postgres.h
View File

@ -655,14 +655,14 @@ extern PGDLLIMPORT bool assert_enabled;
/*
* TrapMacro is the same as Trap but it's intended for use in macros:
*
* #define foo(x) (AssertMacro(x != 0) && bar(x))
* #define foo(x) (AssertMacro(x != 0), bar(x))
*
* Isn't CPP fun?
*/
#define TrapMacro(condition, errorType) \
((bool) ((! assert_enabled) || ! (condition) || \
(ExceptionalCondition(CppAsString(condition), (errorType), \
__FILE__, __LINE__))))
__FILE__, __LINE__), 0)))
#ifndef USE_ASSERT_CHECKING
#define Assert(condition)
@ -683,8 +683,8 @@ extern PGDLLIMPORT bool assert_enabled;
Trap(!(condition), "BadState")
#endif /* USE_ASSERT_CHECKING */
extern int ExceptionalCondition(const char *conditionName,
extern void ExceptionalCondition(const char *conditionName,
const char *errorType,
const char *fileName, int lineNumber);
const char *fileName, int lineNumber) __attribute__((noreturn));
#endif /* POSTGRES_H */