Merge pull request #17549 from yuwata/tiny-fixes

[thirdparty/systemd.git] / src / journal / journald-wall.c

diff --git a/src/journal/journald-wall.c b/src/journal/journald-wall.c
index 5284914941f3091140cf43fc8f905cd4d979aa79..21ec5a785bf4b5f937eec613871ec054899f08d3 100644 (file)
--- a/src/journal/journald-wall.c
+++ b/src/journal/journald-wall.c
@@ -1,30 +1,12 @@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-/***
-  This file is part of systemd.
-
-  Copyright 2014 Sebastian Thorarensen
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
-
-#include "formats-util.h"
+#include "alloc-util.h"
+#include "format-util.h"
 #include "journald-server.h"
+#include "journald-wall.h"
 #include "process-util.h"
 #include "string-util.h"
 #include "utmp-wtmp.h"
-#include "journald-wall.h"
 
 void server_forward_wall(
                 Server *s,
@@ -45,7 +27,7 @@ void server_forward_wall(
 
         if (ucred) {
                 if (!identifier) {
-                        get_process_comm(ucred->pid, &ident_buf);
+                        (void) get_process_comm(ucred->pid, &ident_buf);
                         identifier = ident_buf;
                 }
 
@@ -58,7 +40,7 @@ void server_forward_wall(
 
         } else if (identifier) {
 
-                l = l_buf = strjoin(identifier, ": ", message, NULL);
+                l = l_buf = strjoin(identifier, ": ", message);
                 if (!l_buf) {
                         log_oom();
                         return;