aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2009-06-25 23:07:15 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2009-06-25 23:07:15 +0000
commit7a58167ea23c4ce3eb380e2b05fc33a8d08d44d1 (patch)
treeb00a3c3c9391649bbb12cc42c6efbdd49dea9c41
parent7e48b77b1cebb9a43f9fdd6b17128a0ba36132f9 (diff)
downloadpostgresql-7a58167ea23c4ce3eb380e2b05fc33a8d08d44d1.tar.gz
postgresql-7a58167ea23c4ce3eb380e2b05fc33a8d08d44d1.zip
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.
-rw-r--r--src/backend/utils/error/elog.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index ba529002f01..db334824347 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -42,7 +42,7 @@
*
*
* 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 @@
#undef _
#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 */
ErrorContextCallback *error_context_stack = NULL;