summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-04-24 13:44:09 +0200
committerSven Eden <yamakuzure@gmx.net>2018-08-24 16:47:08 +0200
commit10380a7990aeed007a771bcf955e203272bfce54 (patch)
tree87cf675b459c7a22353c6f42f748cbf231ffcb07
parent71c3693c618189fa097eed1113aa1dd86f032cee (diff)
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.
-rw-r--r--src/basic/capability-util.c3
-rw-r--r--src/core/cgroup.c4
2 files changed, 2 insertions, 5 deletions
diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index bfee89eab..4409482b6 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/core/cgroup.c b/src/core/cgroup.c
index 34ff984df..a1e66864b 100644
--- a/src/core/cgroup.c
+++ b/src/core/cgroup.c
@@ -309,13 +309,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))