Commit 7a58167e authored by Tom Lane's avatar Tom Lane

Add __attribute__((format_arg(1))) to the declaration of err_gettext(),

to restore gcc's ability to crosscheck format arguments within elog.c.
Noted in a test compilation with -Wformat-nonliteral enabled.
parent 7e48b77b
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.215 2009/06/11 14:49:05 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.216 2009/06/25 23:07:15 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -75,6 +75,11 @@ ...@@ -75,6 +75,11 @@
#undef _ #undef _
#define _(x) err_gettext(x) #define _(x) err_gettext(x)
static const char *err_gettext(const char *str)
/* This extension allows gcc to check the format string for consistency with
the supplied arguments. */
__attribute__((format_arg(1)));
/* Global variables */ /* Global variables */
ErrorContextCallback *error_context_stack = NULL; ErrorContextCallback *error_context_stack = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment