From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 25 Jan 2024 15:38:28 +0000 (+0100)
Subject: journald: inline one variable declaration
X-Git-Tag: v256-rc1~1015^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e9dc98c56b6ddd95e577872686e6cd42c6d8d60c;p=thirdparty%2Fsystemd.git

journald: inline one variable declaration
---

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 2469451fca4..8f9ecd96220 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -2507,7 +2507,7 @@ int server_new(Server **ret) {
 int server_init(Server *s, const char *namespace) {
         const char *native_socket, *syslog_socket, *stdout_socket, *varlink_socket, *e;
         _cleanup_fdset_free_ FDSet *fds = NULL;
-        int n, r, fd, varlink_fd = -EBADF;
+        int n, r, varlink_fd = -EBADF;
         bool no_sockets;
 
         assert(s);
@@ -2575,7 +2575,7 @@ int server_init(Server *s, const char *namespace) {
         syslog_socket = strjoina(s->runtime_directory, "/dev-log");
         varlink_socket = strjoina(s->runtime_directory, "/io.systemd.journal");
 
-        for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++) {
+        for (int fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd++)
 
                 if (sd_is_socket_unix(fd, SOCK_DGRAM, -1, native_socket, 0) > 0) {
 
@@ -2628,7 +2628,6 @@ int server_init(Server *s, const char *namespace) {
                         if (r < 0)
                                 return log_oom();
                 }
-        }
 
         /* Try to restore streams, but don't bother if this fails */
         (void) server_restore_streams(s, fds);