From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 30 Aug 2016 19:02:36 +0000 (+0200)
Subject: log: minor fixes
X-Git-Tag: v232.2~70
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=33ca31d7107330a9f5ddf26720fccbe623da5176

log: minor fixes

Most important is a fix to negate the error number if necessary, before we
first access it.
---

diff --git a/src/basic/log.c b/src/basic/log.c
index da6aa409b..a158212d5 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -135,7 +135,7 @@ static int create_log_socket(int type) {
         if (fd < 0)
                 return -errno;
 
-        fd_inc_sndbuf(fd, SNDBUF_SIZE);
+        (void) fd_inc_sndbuf(fd, SNDBUF_SIZE);
 
         /* We need a blocking fd here since we'd otherwise lose
         messages way too early. However, let's not hang forever in the
@@ -355,7 +355,7 @@ static int write_to_console(
                 return 0;
 
         if (log_target == LOG_TARGET_CONSOLE_PREFIXED) {
-                sprintf(prefix, "<%i>", level);
+                xsprintf(prefix, "<%i>", level);
                 IOVEC_SET_STRING(iovec[n++], prefix);
         }
 
@@ -577,6 +577,9 @@ static int log_dispatch(
 
         assert(buffer);
 
+        if (error < 0)
+                error = -error;
+
         if (log_target == LOG_TARGET_NULL)
                 return -error;
 
@@ -584,9 +587,6 @@ static int log_dispatch(
         if ((level & LOG_FACMASK) == 0)
                 level = log_facility | LOG_PRI(level);
 
-        if (error < 0)
-                error = -error;
-
         do {
                 char *e;
                 int k = 0;