From b1c05b98bfbfd967ddeaad1c7f827153989013b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 24 Apr 2018 13:44:09 +0200 Subject: [PATCH] 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. --- 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 7fd39b29da5..eefea277208 100644 --- a/src/activate/activate.c +++ b/src/activate/activate.c @@ -35,16 +35,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; @@ -194,8 +192,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); @@ -312,10 +309,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; @@ -490,8 +484,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 233d18a854a..645cd322a7f 100644 --- a/src/basic/capability-util.c +++ b/src/basic/capability-util.c @@ -301,8 +301,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 294d5922cf1..b9659d4860b 100644 --- a/src/boot/bootctl.c +++ b/src/boot/bootctl.c @@ -428,8 +428,7 @@ static int copy_file_with_version_check(const char *from, const char *to, bool f (void) fsync_directory_of_file(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 7dc8467a7f8..22cd8e9158b 100644 --- a/src/core/bpf-firewall.c +++ b/src/core/bpf-firewall.c @@ -728,8 +728,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; @@ -753,8 +752,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 426732483ef..25778320ab5 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -308,13 +308,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.39.2