diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2020-03-25 11:57:36 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2020-03-25 11:57:36 -0400 |
| commit | bda6dedbea599209048bc51115ecb2062ceb976c (patch) | |
| tree | 978a9e7efd646601f82780c6dcd41eb274f29acc /src/include/executor/executor.h | |
| parent | f5817595a7f194d25bc9be5b035eb1f7f60cd1fa (diff) | |
Go back to returning int from ereport auxiliary functions.
This reverts the parts of commit 17a28b03645e27d73bf69a95d7569b61e58f06eb
that changed ereport's auxiliary functions from returning dummy integer
values to returning void. It turns out that a minority of compilers
complain (not entirely unreasonably) about constructs such as
(condition) ? errdetail(...) : 0
if errdetail() returns void rather than int. We could update those
call sites to say "(void) 0" perhaps, but the expectation for this
patch set was that ereport callers would not have to change anything.
And this aspect of the patch set was already the most invasive and
least compelling part of it, so let's just drop it.
Per buildfarm.
Discussion: https://postgr.es/m/CA+fd4k6N8EjNvZpM8nme+y+05mz-SM8Z_BgkixzkA34R+ej0Kw@mail.gmail.com
Diffstat (limited to 'src/include/executor/executor.h')
| -rw-r--r-- | src/include/executor/executor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index cd0e6439cde..94890512dc8 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -546,7 +546,7 @@ exec_rt_fetch(Index rti, EState *estate) extern Relation ExecGetRangeTableRelation(EState *estate, Index rti); -extern void executor_errposition(EState *estate, int location); +extern int executor_errposition(EState *estate, int location); extern void RegisterExprContextCallback(ExprContext *econtext, ExprContextCallbackFunction function, |