X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flog.c;h=1a6ea7e5a84fbb2b97303f2b2775ce4e62bfde80;hb=a3f914b2a21decb0c4bd7a763ddd3ace215091cb;hp=f65e8d1006d0c9a0b155e85c70e9a0e3853cfc43;hpb=891703e1eef9f9850c7bd34b6d9df0e6c2c8a939;p=elogind.git

diff --git a/src/log.c b/src/log.c
index f65e8d100..1a6ea7e5a 100644
--- a/src/log.c
+++ b/src/log.c
@@ -618,13 +618,12 @@ int log_meta(
         return r;
 }
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
 _noreturn_ static void log_assert(const char *text, const char *file, int line, const char *func, const char *format) {
         static char buffer[LINE_MAX];
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
         snprintf(buffer, sizeof(buffer), format, text, file, line, func);
-#pragma GCC diagnostic pop
 
         char_array_0(buffer);
         log_abort_msg = buffer;
@@ -632,6 +631,7 @@ _noreturn_ static void log_assert(const char *text, const char *file, int line,
         log_dispatch(LOG_CRIT, file, line, func, buffer);
         abort();
 }
+#pragma GCC diagnostic pop
 
 void log_assert_failed(const char *text, const char *file, int line, const char *func) {
         log_assert(text, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.");