From: Jia Tan <jiat0218@gmail.com>
Date: Wed, 11 Jan 2023 14:46:48 +0000 (+0800)
Subject: xz: Fix warning -Wformat-nonliteral on clang in message.c.
X-Git-Tag: v5.2.11~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e2b345cfd28bdf0aabbd326254bc7246dd1125e;p=thirdparty%2Fxz.git

xz: Fix warning -Wformat-nonliteral on clang in message.c.

clang and gcc differ in how they handle -Wformat-nonliteral. gcc will
allow a non-literal format string as long as the function takes its
format arguments as a va_list.
---

diff --git a/src/xz/message.c b/src/xz/message.c
index da90420f..45cc6a1f 100644
--- a/src/xz/message.c
+++ b/src/xz/message.c
@@ -723,7 +723,16 @@ vmessage(enum message_verbosity v, const char *fmt, va_list ap)
 		// This is a translatable string because French needs
 		// a space before a colon.
 		fprintf(stderr, _("%s: "), progname);
+
+#ifdef __clang__
+#	pragma GCC diagnostic push
+#	pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
 		vfprintf(stderr, fmt, ap);
+#ifdef __clang__
+#	pragma GCC diagnostic pop
+#endif
+
 		fputc('\n', stderr);
 
 		signals_unblock();