database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Add compiler hints to PLy_elog()

Browse Source 
Decorate PLy_elog() in a similar way as elog(), to give compilers and
static analyzers hints in which cases it does not return.

Reviewed-by: John Naylor <jcnaylor@gmail.com>
This commit is contained in:
Peter Eisentraut 2017-08-22 20:05:49 -04:00
parent eaedf0df71
commit cdddd5d40b
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pl/plpython/plpy_elog.c
View File

@ -44,7 +44,7 @@ static bool set_string_attr(PyObject *obj, char *attrname, char *str);
* in the context. * in the context.
*/ */
void void
PLy_elog(int elevel, const char *fmt,...) PLy_elog_impl(int elevel, const char *fmt,...)
{ {
char *xmsg; char *xmsg;
char *tbmsg; char *tbmsg;

28
src/pl/plpython/plpy_elog.h
View File

@ -10,7 +10,33 @@ extern PyObject *PLy_exc_error;
extern PyObject *PLy_exc_fatal; extern PyObject *PLy_exc_fatal;
extern PyObject *PLy_exc_spi_error; extern PyObject *PLy_exc_spi_error;
extern void PLy_elog(int elevel, const char *fmt,...) pg_attribute_printf(2, 3); /*
* PLy_elog()
*
* See comments at elog() about the compiler hinting.
*/
#ifdef HAVE__VA_ARGS
#ifdef HAVE__BUILTIN_CONSTANT_P
#define PLy_elog(elevel, ...) \
do { \
PLy_elog_impl(elevel, __VA_ARGS__); \
if (__builtin_constant_p(elevel) && (elevel) >= ERROR) \
pg_unreachable(); \
} while(0)
#else /* !HAVE__BUILTIN_CONSTANT_P */
#define PLy_elog(elevel, ...) \
do { \
const int elevel_ = (elevel); \
PLy_elog_impl(elevel_, __VA_ARGS__); \
if (elevel_ >= ERROR) \
pg_unreachable(); \
} while(0)
#endif /* HAVE__BUILTIN_CONSTANT_P */
#else /* !HAVE__VA_ARGS */
#define PLy_elog PLy_elog_impl
#endif /* HAVE__VA_ARGS */
extern void PLy_elog_impl(int elevel, const char *fmt,...) pg_attribute_printf(2, 3);
extern void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_printf(2, 3); extern void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_printf(2, 3);