chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: add support for wall forwarding
[elogind.git]
/
src
/
journal
/
microhttpd-util.c
diff --git
a/src/journal/microhttpd-util.c
b/src/journal/microhttpd-util.c
index 5675af4a19068afabcb3852ca3eda2c573fcd055..3844f7a03c5e477e514883afdcde7e33a678ac98 100644
(file)
--- a/
src/journal/microhttpd-util.c
+++ b/
src/journal/microhttpd-util.c
@@
-27,15
+27,15
@@
#include "macro.h"
#include "util.h"
#include "macro.h"
#include "util.h"
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
-_printf_(2,0)
void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
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;
}
if (asprintf(&f, "microhttpd: %s", fmt) <= 0) {
log_oom();
return;
}
+
+ DISABLE_WARNING_FORMAT_NONLITERAL;
log_metav(LOG_INFO, NULL, 0, NULL, f, ap);
log_metav(LOG_INFO, NULL, 0, NULL, f, ap);
+ REENABLE_WARNING;
}
}
-#pragma GCC diagnostic pop