From 086891e5c119abb9854237fc32e736fe2d67234c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 27 Nov 2014 19:48:02 +0100 Subject: log: add an "error" parameter to all low-level logging calls and intrdouce log_error_errno() as log calls that take error numbers This change has two benefits: - The format string %m will now resolve to the specified error (or to errno if the specified error is 0. This allows getting rid of a ton of strerror() invocations, a function that is not thread-safe. - The specified error can be passed to the journal in the ERRNO= field. Now of course, we just need somebody to convert all cases of this: log_error("Something happened: %s", strerror(-r)); into thus: log_error_errno(-r, "Something happened: %m"); --- src/journal-remote/microhttpd-util.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/journal-remote') diff --git a/src/journal-remote/microhttpd-util.c b/src/journal-remote/microhttpd-util.c index 55c45f4693..bec4134620 100644 --- a/src/journal-remote/microhttpd-util.c +++ b/src/journal-remote/microhttpd-util.c @@ -41,7 +41,7 @@ void microhttpd_logger(void *arg, const char *fmt, va_list ap) { f = strappenda("microhttpd: ", fmt); DISABLE_WARNING_FORMAT_NONLITERAL; - log_metav(LOG_INFO, NULL, 0, NULL, f, ap); + log_metav(LOG_INFO, 0, NULL, 0, NULL, f, ap); REENABLE_WARNING; } @@ -126,11 +126,10 @@ void log_func_gnutls(int level, const char *message) { if (0 <= level && level < (int) ELEMENTSOF(gnutls_log_map)) { if (gnutls_log_map[level].enabled) - log_meta(gnutls_log_map[level].level, NULL, 0, NULL, - "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message); + log_meta(gnutls_log_map[level].level, 0, NULL, 0, NULL, "gnutls %d/%s: %s", level, gnutls_log_map[level].names[1], message); } else { log_debug("Received GNUTLS message with unknown level %d.", level); - log_meta(LOG_DEBUG, NULL, 0, NULL, "gnutls: %s", message); + log_meta(LOG_DEBUG, 0, NULL, 0, NULL, "gnutls: %s", message); } } -- cgit v1.2.3-54-g00ecf