diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-04-29 21:07:35 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-04-29 21:20:14 +0300 |
| commit | 81107282a5ff1490a0a4ded193cbc61e69cda537 (patch) | |
| tree | bc39c1a3ff53655183d246fb7a6bd4da011262f0 /src/backend/utils/error/assert.c | |
| parent | 2227bb9c948d2dcc167d414630ed3bae7f31db83 (diff) | |
| download | postgresql-81107282a5ff1490a0a4ded193cbc61e69cda537.tar.gz postgresql-81107282a5ff1490a0a4ded193cbc61e69cda537.zip | |
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.
Diffstat (limited to 'src/backend/utils/error/assert.c')
| -rw-r--r-- | src/backend/utils/error/assert.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c index ad548239f24..2908abe8520 100644 --- a/src/backend/utils/error/assert.c +++ b/src/backend/utils/error/assert.c @@ -21,11 +21,8 @@ /* * ExceptionalCondition - Handles the failure of an Assert() - * - * Note: this can't actually return, but we declare it as returning int - * because the TrapMacro() macro might get wonky otherwise. */ -int +void ExceptionalCondition(const char *conditionName, const char *errorType, const char *fileName, @@ -55,6 +52,4 @@ ExceptionalCondition(const char *conditionName, #endif abort(); - - return 0; } |