From bcfce235a3d757f0ec3b0c01e8583382db1adfe2 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Feb 2014 18:18:32 +0100
Subject: macro: introduce a nice macro for disabling -Wformat-nonliteral
 temporarily

---
 src/journal/microhttpd-util.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/journal')

diff --git a/src/journal/microhttpd-util.c b/src/journal/microhttpd-util.c
index c45d0df722..3844f7a03c 100644
--- a/src/journal/microhttpd-util.c
+++ b/src/journal/microhttpd-util.c
@@ -27,14 +27,15 @@
 #include "macro.h"
 #include "util.h"
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
-        _cleanup_free_ char *f;
+        _cleanup_free_ char *f = NULL;
+
         if (asprintf(&f, "microhttpd: %s", fmt) <= 0) {
                 log_oom();
                 return;
         }
+
+        DISABLE_WARNING_FORMAT_NONLITERAL;
         log_metav(LOG_INFO, NULL, 0, NULL, f, ap);
+        REENABLE_WARNING;
 }
-#pragma GCC diagnostic pop
-- 
cgit v1.2.3-54-g00ecf