Suppress -Wformat-overflow warnings in 9.2's xml.c.

tglsfdc · tglsfdc · commit 3f9700acb238 · 2021-12-13T11:21:58.000-05:00
If not using --with-libxml, late-model gcc complains about "'%s' directive argument is null" in places where xml.c passes the result of map_sql_identifier_to_xml_name() to %s. That's not so surprising, because without USE_LIBXML the body of that function is NO_XML_SUPPORT(); return NULL; and before 9.3 the compiler won't understand that NO_XML_SUPPORT() doesn't return. Silence the warnings by returning "" instead. We don't need this hack in later branches, AFAICT. Discussion: https://postgr.es/m/d0316012-ece7-7b7e-2d36-9c38cb77cb3b@enterprisedb.com
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
@@ -1884,7 +1884,7 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,
 	return buf.data;
 #else							/* not USE_LIBXML */
 	NO_XML_SUPPORT();
-	return NULL;
+	return "";
 #endif   /* not USE_LIBXML */
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1884,7 +1884,7 @@ map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,`
`1884`	`1884`	`return buf.data;`
`1885`	`1885`	`#else /* not USE_LIBXML */`
`1886`	`1886`	`NO_XML_SUPPORT();`
`1887`		`- return NULL;`
	`1887`	`+ return "";`
`1888`	`1888`	`#endif /* not USE_LIBXML */`
`1889`	`1889`	`}`
`1890`	`1890`