From 81107282a5ff1490a0a4ded193cbc61e69cda537 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sun, 29 Apr 2012 21:07:35 +0300 Subject: Change return type of ExceptionalCondition to void and mark it noreturn 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. --- src/include/postgres.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/include/postgres.h') diff --git a/src/include/postgres.h b/src/include/postgres.h index c429f291c2f..94c0218cd1b 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -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 */ -- cgit v1.2.3