From 33ac7a346e9134e27d26c88fc0693f16b1c55deb Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 10 Sep 2021 14:22:24 +0000
Subject: Get rid of the last two warnings by turning them off around the
 problem statements, if the compiler supports it.

---
 log.c  |  4 ++--
 tmux.h | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/log.c b/log.c
index ec54711a..d4808427 100644
--- a/log.c
+++ b/log.c
@@ -147,7 +147,7 @@ fatal(const char *msg, ...)
 	va_start(ap, msg);
 	if (asprintf(&fmt, "fatal: %s: %s", msg, strerror(errno)) == -1)
 		exit(1);
-	log_vwrite(fmt, ap);
+	no_format_nonliteral(log_vwrite(fmt, ap));
 	va_end(ap);
 	exit(1);
 }
@@ -162,7 +162,7 @@ fatalx(const char *msg, ...)
 	va_start(ap, msg);
 	if (asprintf(&fmt, "fatal: %s", msg) == -1)
 		exit(1);
-	log_vwrite(fmt, ap);
+	no_format_nonliteral(log_vwrite(fmt, ap));
 	va_end(ap);
 	exit(1);
 }
diff --git a/tmux.h b/tmux.h
index 7a77cdae..6c7cf046 100644
--- a/tmux.h
+++ b/tmux.h
@@ -93,6 +93,20 @@ struct winlink;
 #define DEFAULT_XPIXEL 16
 #define DEFAULT_YPIXEL 32
 
+/* Don't complain about format arguments. */
+#if __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#define no_format_nonliteral(x) do { \
+	_Pragma ("GCC diagnostic push") \
+	_Pragma ("GCC diagnostic ignored \"-Wformat-nonliteral\"") \
+	 x; \
+	_Pragma ("GCC diagnostic pop") \
+} while (0)
+#else
+#define no_format_nonliteral(x) do { \
+	 x; \
+} while (0)
+#endif
+
 /* Attribute to make GCC check printf-like arguments. */
 #define printflike(a, b) __attribute__ ((format (printf, a, b)))
 
-- 
cgit v1.2.3


From e6b40cb339e06b9084a9139a75d62fb7a6005448 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Fri, 10 Sep 2021 15:03:18 +0000
Subject: Do fatal/fatalx a different way so the compiler trick to avoid
 warnings becomes unnecessary, prompted by theo.

---
 log.c  | 35 +++++++++++++++++------------------
 tmux.h | 14 --------------
 2 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/log.c b/log.c
index d4808427..abc097dc 100644
--- a/log.c
+++ b/log.c
@@ -99,28 +99,27 @@ log_close(void)
 
 /* Write a log message. */
 static void printflike(1, 0)
-log_vwrite(const char *msg, va_list ap)
+log_vwrite(const char *msg, va_list ap, const char *prefix)
 {
-	char		*fmt, *out;
+	char		*s, *out;
 	struct timeval	 tv;
 
 	if (log_file == NULL)
 		return;
 
-	if (vasprintf(&fmt, msg, ap) == -1)
+	if (vasprintf(&s, msg, ap) == -1)
 		return;
-	if (stravis(&out, fmt, VIS_OCTAL|VIS_CSTYLE|VIS_TAB|VIS_NL) == -1) {
-		free(fmt);
+	if (stravis(&out, s, VIS_OCTAL|VIS_CSTYLE|VIS_TAB|VIS_NL) == -1) {
+		free(s);
 		return;
 	}
+	free(s);
 
 	gettimeofday(&tv, NULL);
-	if (fprintf(log_file, "%lld.%06d %s\n", (long long)tv.tv_sec,
-	    (int)tv.tv_usec, out) != -1)
+	if (fprintf(log_file, "%lld.%06d %s%s\n", (long long)tv.tv_sec,
+	    (int)tv.tv_usec, prefix, out) != -1)
 		fflush(log_file);
-
 	free(out);
-	free(fmt);
 }
 
 /* Log a debug message. */
@@ -133,7 +132,7 @@ log_debug(const char *msg, ...)
 		return;
 
 	va_start(ap, msg);
-	log_vwrite(msg, ap);
+	log_vwrite(msg, ap, "");
 	va_end(ap);
 }
 
@@ -141,14 +140,16 @@ log_debug(const char *msg, ...)
 __dead void
 fatal(const char *msg, ...)
 {
-	char	*fmt;
+	char	 tmp[256];
 	va_list	 ap;
 
+	if (snprintf(tmp, sizeof tmp, "fatal: %s: ", strerror(errno)) < 0)
+		exit (1);
+
 	va_start(ap, msg);
-	if (asprintf(&fmt, "fatal: %s: %s", msg, strerror(errno)) == -1)
-		exit(1);
-	no_format_nonliteral(log_vwrite(fmt, ap));
+	log_vwrite(msg, ap, tmp);
 	va_end(ap);
+
 	exit(1);
 }
 
@@ -156,13 +157,11 @@ fatal(const char *msg, ...)
 __dead void
 fatalx(const char *msg, ...)
 {
-	char	*fmt;
 	va_list	 ap;
 
 	va_start(ap, msg);
-	if (asprintf(&fmt, "fatal: %s", msg) == -1)
-		exit(1);
-	no_format_nonliteral(log_vwrite(fmt, ap));
+	log_vwrite(msg, ap, "fatal: ");
 	va_end(ap);
+
 	exit(1);
 }
diff --git a/tmux.h b/tmux.h
index 6c7cf046..7a77cdae 100644
--- a/tmux.h
+++ b/tmux.h
@@ -93,20 +93,6 @@ struct winlink;
 #define DEFAULT_XPIXEL 16
 #define DEFAULT_YPIXEL 32
 
-/* Don't complain about format arguments. */
-#if __clang__ || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
-#define no_format_nonliteral(x) do { \
-	_Pragma ("GCC diagnostic push") \
-	_Pragma ("GCC diagnostic ignored \"-Wformat-nonliteral\"") \
-	 x; \
-	_Pragma ("GCC diagnostic pop") \
-} while (0)
-#else
-#define no_format_nonliteral(x) do { \
-	 x; \
-} while (0)
-#endif
-
 /* Attribute to make GCC check printf-like arguments. */
 #define printflike(a, b) __attribute__ ((format (printf, a, b)))
 
-- 
cgit v1.2.3