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/backend/utils/error/elog.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/backend/utils/error/elog.c') diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 239ac19882d..65c28a75080 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -1507,15 +1507,9 @@ pg_re_throw(void) errfinish(0); } - /* We mustn't return... */ + /* Doesn't return ... */ ExceptionalCondition("pg_re_throw tried to return", "FailedAssertion", __FILE__, __LINE__); - - /* - * Since ExceptionalCondition isn't declared noreturn because of - * TrapMacro(), we need this to keep gcc from complaining. - */ - abort(); } -- cgit v1.2.3