shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

log: move #pragma around the function

Browse Source 
Koen reported errors with gcc 4.5.4 for arm:
src/log.c:624:9: error: #pragma GCC diagnostic not allowed inside
functions
This commit is contained in:
Michal Schmidt 2012-01-19 13:00:34 +01:00
parent 891703e1ee
commit a3f914b2a2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/log.c
View File

@ -618,13 +618,12 @@ int log_meta(
return r; 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) { _noreturn_ static void log_assert(const char *text, const char *file, int line, const char *func, const char *format) {
static char buffer[LINE_MAX]; static char buffer[LINE_MAX];
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
snprintf(buffer, sizeof(buffer), format, text, file, line, func); snprintf(buffer, sizeof(buffer), format, text, file, line, func);
#pragma GCC diagnostic pop
char_array_0(buffer); char_array_0(buffer);
log_abort_msg = 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); log_dispatch(LOG_CRIT, file, line, func, buffer);
abort(); abort();
} }
#pragma GCC diagnostic pop
void log_assert_failed(const char *text, const char *file, int line, const char *func) { 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."); log_assert(text, file, line, func, "Assertion '%s' failed at %s:%u, function %s(). Aborting.");