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

tglsfdc · tglsfdc · commit 7a58167ea23c · 2009-06-25T23:07:15.000Z
to restore gcc's ability to crosscheck format arguments within elog.c.
Noted in a test compilation with -Wformat-nonliteral enabled.
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`*`
`43`	`43`	`*`
`44`	`44`	`* IDENTIFICATION`
`45`		`- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.215 2009/06/11 14:49:05 momjian Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.216 2009/06/25 23:07:15 tgl Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -75,6 +75,11 @@`
`75`	`75`	`#undef _`
`76`	`76`	`#define _(x) err_gettext(x)`
`77`	`77`
	`78`	`+static const char err_gettext(const char str)`
	`79`	`+/* This extension allows gcc to check the format string for consistency with`
	`80`	`+ the supplied arguments. */`
	`81`	`+__attribute__((format_arg(1)));`
	`82`	`+`
`78`	`83`	`/* Global variables */`
`79`	`84`	`ErrorContextCallback *error_context_stack = NULL;`
`80`	`85`