From: Mike Yuan <me@yhndnzj.com>
Date: Sun, 14 Jul 2024 15:32:12 +0000 (+0200)
Subject: core/manager: modernize manager_setup_notify() a bit
X-Git-Tag: v257-rc1~846^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=678f271cff278429d680dcbfd6cf1a14b1cff3fe;p=thirdparty%2Fsystemd.git

core/manager: modernize manager_setup_notify() a bit
---

diff --git a/src/core/manager.c b/src/core/manager.c
index 1504d3fd7de..879b73af3c7 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -1081,7 +1081,7 @@ static int manager_setup_notify(Manager *m) {
                 if (fd < 0)
                         return log_error_errno(errno, "Failed to allocate notification socket: %m");
 
-                fd_increase_rxbuf(fd, NOTIFY_RCVBUF_SIZE);
+                (void) fd_increase_rxbuf(fd, NOTIFY_RCVBUF_SIZE);
 
                 m->notify_socket = path_join(m->prefix[EXEC_DIRECTORY_RUNTIME], "systemd/notify");
                 if (!m->notify_socket)
@@ -1098,11 +1098,11 @@ static int manager_setup_notify(Manager *m) {
 
                 r = mac_selinux_bind(fd, &sa.sa, sa_len);
                 if (r < 0)
-                        return log_error_errno(r, "bind(%s) failed: %m", m->notify_socket);
+                        return log_error_errno(r, "Failed to bind notify fd to '%s': %m", m->notify_socket);
 
                 r = setsockopt_int(fd, SOL_SOCKET, SO_PASSCRED, true);
                 if (r < 0)
-                        return log_error_errno(r, "SO_PASSCRED failed: %m");
+                        return log_error_errno(r, "Failed to enable SO_PASSCRED for notify socket: %m");
 
                 m->notify_fd = TAKE_FD(fd);
 
@@ -2042,7 +2042,7 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds, const char *roo
                  * containers. */
                 manager_distribute_fds(m, fds);
 
-                /* We might have deserialized the notify fd, but if we didn't then let's create the bus now */
+                /* We might have deserialized the notify fd, but if we didn't then let's create it now */
                 r = manager_setup_notify(m);
                 if (r < 0)
                         /* No sense to continue without notifications, our children would fail anyway. */