From a3f914b2a21decb0c4bd7a763ddd3ace215091cb Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Thu, 19 Jan 2012 13:00:34 +0100 Subject: [PATCH] log: move #pragma around the function Koen reported errors with gcc 4.5.4 for arm: src/log.c:624:9: error: #pragma GCC diagnostic not allowed inside functions --- src/log.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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."); -- 2.30.2