File 0042-tree-wide-avoid-assignment-of-r-just-to-us... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0042-tree-wide-avoid-assignment-of-r-just-to-use-in-a-com.patch of Package systemd (Revision 2a0ef622b860d89b09df9bc0f43c3432)

Currently displaying revision 2a0ef622b860d89b09df9bc0f43c3432 , Show latest

From 1b54c352f825911a39dd93cd903f3fc89e130f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 24 Apr 2018 13:44:09 +0200
Subject: [PATCH 42/51] tree-wide: avoid assignment of r just to use in a
 comparison

This changes
  r = ...;
  if (r < 0)
to
  if (... < 0)
when r will not be used again.

(cherry picked from commit b1c05b98bfbfd967ddeaad1c7f827153989013b8)
---
 src/activate/activate.c     | 19 ++++++-------------
 src/basic/capability-util.c |  3 +--
 src/boot/bootctl.c          |  3 +--
 src/core/bpf-firewall.c     |  6 ++----
 src/core/cgroup.c           |  4 +---
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 6ebd820410..374c9082af 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -46,16 +46,14 @@ static bool arg_inetd = false;
 
 static int add_epoll(int epoll_fd, int fd) {
         struct epoll_event ev = {
-                .events = EPOLLIN
+                .events = EPOLLIN,
+                .data.fd = fd,
         };
-        int r;
 
         assert(epoll_fd >= 0);
         assert(fd >= 0);
 
-        ev.data.fd = fd;
-        r = epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev);
-        if (r < 0)
+        if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, fd, &ev) < 0)
                 return log_error_errno(errno, "Failed to add event on epoll fd:%d for fd:%d: %m", epoll_fd, fd);
 
         return 0;
@@ -210,8 +208,7 @@ static int exec_process(const char* name, char **argv, char **env, int start_fd,
                 if (start_fd != SD_LISTEN_FDS_START) {
                         assert(n_fds == 1);
 
-                        r = dup2(start_fd, SD_LISTEN_FDS_START);
-                        if (r < 0)
+                        if (dup2(start_fd, SD_LISTEN_FDS_START) < 0)
                                 return log_error_errno(errno, "Failed to dup connection: %m");
 
                         safe_close(start_fd);
@@ -343,10 +340,7 @@ static int install_chld_handler(void) {
                 .sa_handler = sigchld_hdl,
         };
 
-        int r;
-
-        r = sigaction(SIGCHLD, &act, 0);
-        if (r < 0)
+        if (sigaction(SIGCHLD, &act, 0) < 0)
                 return log_error_errno(errno, "Failed to install SIGCHLD handler: %m");
 
         return 0;
@@ -521,8 +515,7 @@ int main(int argc, char **argv, char **envp) {
         for (;;) {
                 struct epoll_event event;
 
-                r = epoll_wait(epoll_fd, &event, 1, -1);
-                if (r < 0) {
+                if (epoll_wait(epoll_fd, &event, 1, -1) < 0) {
                         if (errno == EINTR)
                                 continue;
 
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index c3de20a0e8..324f24aa1b 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -304,8 +304,7 @@ int drop_privileges(uid_t uid, gid_t gid, uint64_t keep_capabilities) {
         if (prctl(PR_SET_KEEPCAPS, 1) < 0)
                 return log_error_errno(errno, "Failed to enable keep capabilities flag: %m");
 
-        r = setresuid(uid, uid, uid);
-        if (r < 0)
+        if (setresuid(uid, uid, uid) < 0)
                 return log_error_errno(errno, "Failed to change user ID: %m");
 
         if (prctl(PR_SET_KEEPCAPS, 0) < 0)
diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index 233bc80292..4ca37f5b54 100644
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -545,8 +545,7 @@ static int copy_file_with_version_check(const char *from, const char *to, bool f
 
         (void) copy_times(fd_from, fd_to);
 
-        r = renameat(AT_FDCWD, t, AT_FDCWD, to);
-        if (r < 0) {
+        if (renameat(AT_FDCWD, t, AT_FDCWD, to) < 0) {
                 (void) unlink_noerrno(t);
                 return log_error_errno(errno, "Failed to rename \"%s\" to \"%s\": %m", t, to);
         }
diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c
index 15ecf55b71..222babaf65 100644
--- a/src/core/bpf-firewall.c
+++ b/src/core/bpf-firewall.c
@@ -742,8 +742,7 @@ int bpf_firewall_supported(void) {
                 .attach_bpf_fd = -1,
         };
 
-        r = bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));
-        if (r < 0) {
+        if (bpf(BPF_PROG_ATTACH, &attr, sizeof(attr)) < 0) {
                 if (errno != EBADF) {
                         log_debug_errno(errno, "Didn't get EBADF from BPF_PROG_ATTACH, BPF firewalling is not supported: %m");
                         return supported = BPF_FIREWALL_UNSUPPORTED;
@@ -767,8 +766,7 @@ int bpf_firewall_supported(void) {
                 .attach_flags = BPF_F_ALLOW_MULTI,
         };
 
-        r = bpf(BPF_PROG_ATTACH, &attr, sizeof(attr));
-        if (r < 0) {
+        if (bpf(BPF_PROG_ATTACH, &attr, sizeof(attr)) < 0) {
                 if (errno == EBADF) {
                         log_debug_errno(errno, "Got EBADF when using BPF_F_ALLOW_MULTI, which indicates it is supported. Yay!");
                         return supported = BPF_FIREWALL_SUPPORTED_WITH_MULTI;
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
index 2f7a4e448a..85181084b1 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -278,13 +278,11 @@ void cgroup_context_dump(CGroupContext *c, FILE* f, const char *prefix) {
 
 static int lookup_block_device(const char *p, dev_t *dev) {
         struct stat st;
-        int r;
 
         assert(p);
         assert(dev);
 
-        r = stat(p, &st);
-        if (r < 0)
+        if (stat(p, &st) < 0)
                 return log_warning_errno(errno, "Couldn't stat device %s: %m", p);
 
         if (S_ISBLK(st.st_mode))
-- 
2.16.4

Places

File 0042-tree-wide-avoid-assignment-of-r-just-to-use-in-a-com.patch of Package systemd (Revision 2a0ef622b860d89b09df9bc0f43c3432)

Places