From f0c8da5396c02e2a935e9e8de1e8c08956feb672 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Tue, 22 Nov 2022 12:14:33 +0100

Subject: [PATCH] tree-wide: modernizations with RET_NERRNO()

(cherry picked from commit 108dfff2c7aebadb78e485ed564caf559367bf7c)

Related: #2137584

---

 src/shared/ask-password-api.c | 30 +++++++++++++-----------------

 src/shared/barrier.c          |  4 +---

 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c

index 17474fe0be..871af2ec99 100644

--- a/src/shared/ask-password-api.c

+++ b/src/shared/ask-password-api.c

@@ -230,8 +230,7 @@ int ask_password_plymouth(

                 if (notify < 0)

                         return -errno;

-                r = inotify_add_watch(notify, flag_file, IN_ATTRIB); /* for the link count */

-                if (r < 0)

+                if (inotify_add_watch(notify, flag_file, IN_ATTRIB) < 0) /* for the link count */

                         return -errno;

         }

@@ -239,8 +238,7 @@ int ask_password_plymouth(

         if (fd < 0)

                 return -errno;

-        r = connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un));

-        if (r < 0)

+        if (connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0)

                 return -errno;

         if (FLAGS_SET(flags, ASK_PASSWORD_ACCEPT_CACHED)) {

@@ -464,10 +462,9 @@ int ask_password_tty(

                 new_termios.c_cc[VMIN] = 1;

                 new_termios.c_cc[VTIME] = 0;

-                if (tcsetattr(ttyfd, TCSADRAIN, &new_termios) < 0) {

-                        r = -errno;

+                r = RET_NERRNO(tcsetattr(ttyfd, TCSADRAIN, &new_termios));

+                if (r < 0)

                         goto finish;

-                }

                 reset_tty = true;

         }

@@ -491,11 +488,11 @@ int ask_password_tty(

                 else

                         timeout = USEC_INFINITY;

-                if (flag_file)

-                        if (access(flag_file, F_OK) < 0) {

-                                r = -errno;

+                if (flag_file) {

+                        r = RET_NERRNO(access(flag_file, F_OK));

+                        if (r < 0)

                                 goto finish;

-                        }

+                }

                 r = ppoll_usec(pollfd, notify >= 0 ? 2 : 1, timeout);

                 if (r == -EINTR)

@@ -747,10 +744,10 @@ int ask_password_agent(

                         r = -errno;

                         goto finish;

                 }

-                if (inotify_add_watch(notify, "/run/systemd/ask-password", IN_ATTRIB /* for mtime */) < 0) {

-                        r = -errno;

+

+                r = RET_NERRNO(inotify_add_watch(notify, "/run/systemd/ask-password", IN_ATTRIB /* for mtime */));

+                if (r < 0)

                         goto finish;

-                }

         }

         fd = mkostemp_safe(temp);

@@ -813,10 +810,9 @@ int ask_password_agent(

         final[sizeof(final)-10] = 's';

         final[sizeof(final)-9] = 'k';

-        if (rename(temp, final) < 0) {

-                r = -errno;

+        r = RET_NERRNO(rename(temp, final));

+        if (r < 0)

                 goto finish;

-        }

         zero(pollfd);

         pollfd[FD_SOCKET].fd = socket_fd;

diff --git a/src/shared/barrier.c b/src/shared/barrier.c

index cbe54a60cd..d76a61a5db 100644

--- a/src/shared/barrier.c

+++ b/src/shared/barrier.c

@@ -92,7 +92,6 @@

  */

 int barrier_create(Barrier *b) {

         _unused_ _cleanup_(barrier_destroyp) Barrier *staging = b;

-        int r;

         assert(b);

@@ -104,8 +103,7 @@ int barrier_create(Barrier *b) {

         if (b->them < 0)

                 return -errno;

-        r = pipe2(b->pipe, O_CLOEXEC | O_NONBLOCK);

-        if (r < 0)

+        if (pipe2(b->pipe, O_CLOEXEC | O_NONBLOCK) < 0)

                 return -errno;

         staging = NULL;