From 148583d62b84832369e9df39b3e527b99ca96761 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 29 Aug 2012 09:11:35 +1000 Subject: tests: move GCC diagnostics pragma outside of function This is a a gcc 4.6+ feature. signal-logging.c:210: error: #pragma GCC diagnostic not allowed inside functions Signed-off-by: Peter Hutterer Reviewed-by: Dave Airlie Signed-off-by: Keith Packard --- test/signal-logging.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/signal-logging.c b/test/signal-logging.c index 3206ddefa..810bd20ed 100644 --- a/test/signal-logging.c +++ b/test/signal-logging.c @@ -178,6 +178,7 @@ number_formatting(void) assert(check_signed_number_format_test(signed_tests + i)); } +#pragma GCC diagnostic ignored "-Wformat-security" static void logging_format(void) { const char *log_file_path = "/tmp/Xorg-logging-test.log"; @@ -207,9 +208,7 @@ static void logging_format(void) assert(strcmp(logmsg, "(EE) test message\n") == 0); /* long buf is truncated to "....en\n" */ -#pragma GCC diagnostic ignored "-Wformat-security" LogMessageVerbSigSafe(X_ERROR, -1, buf); -#pragma GCC diagnostic pop "-Wformat-security" read_log_msg(logmsg); assert(strcmp(&logmsg[strlen(logmsg) - 3], "en\n") == 0); @@ -298,6 +297,7 @@ static void logging_format(void) #undef read_log_msg } +#pragma GCC diagnostic pop "-Wformat-security" int main(int argc, char **argv) -- cgit v1.2.3