From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 12 May 2020 16:52:33 +0000 (+0200)
Subject: journald: use log_warning_errno() where appropriate
X-Git-Tag: v246-rc1~375^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5fe7fb0bf604b7652091ffacd5679b310b18a70f;p=thirdparty%2Fsystemd.git

journald: use log_warning_errno() where appropriate
---

diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c
index 6c10bfc2593..e4f0ee36f44 100644
--- a/src/journal/journald-stream.c
+++ b/src/journal/journald-stream.c
@@ -322,8 +322,8 @@ static int stdout_stream_log(StdoutStream *s, const char *p, LineBreak line_brea
 }
 
 static int stdout_stream_line(StdoutStream *s, char *p, LineBreak line_break) {
-        int r;
         char *orig;
+        int r;
 
         assert(s);
         assert(p);
@@ -332,10 +332,9 @@ static int stdout_stream_line(StdoutStream *s, char *p, LineBreak line_break) {
         p = strstrip(p);
 
         /* line breaks by NUL, line max length or EOF are not permissible during the negotiation part of the protocol */
-        if (line_break != LINE_BREAK_NEWLINE && s->state != STDOUT_STREAM_RUNNING) {
-                log_warning("Control protocol line not properly terminated.");
-                return -EINVAL;
-        }
+        if (line_break != LINE_BREAK_NEWLINE && s->state != STDOUT_STREAM_RUNNING)
+                return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
+                                         "Control protocol line not properly terminated.");
 
         switch (s->state) {