From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Mar 2019 11:30:49 +0000 (+0100)
Subject: capability: minor coding style updates
X-Git-Tag: v242-rc1~97^2~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15ce3f2664f22ec556477ccf0f4fd6ec0307c18d;p=thirdparty%2Fsystemd.git

capability: minor coding style updates
---

diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c
index aca861e5eee..9f66027a784 100644
--- a/src/basic/capability-util.c
+++ b/src/basic/capability-util.c
@@ -28,8 +28,8 @@ int have_effective_cap(int value) {
 
         if (cap_get_flag(cap, value, CAP_EFFECTIVE, &fv) < 0)
                 return -errno;
-        else
-                return fv == CAP_SET;
+
+        return fv == CAP_SET;
 }
 
 unsigned long cap_last_cap(void) {
@@ -107,13 +107,13 @@ int capability_update_inherited_set(cap_t caps, uint64_t set) {
 }
 
 int capability_ambient_set_apply(uint64_t set, bool also_inherit) {
-        unsigned long i;
         _cleanup_cap_free_ cap_t caps = NULL;
+        unsigned long i;
+        int r;
 
         /* Add the capabilities to the ambient set. */
 
         if (also_inherit) {
-                int r;
                 caps = cap_get_proc();
                 if (!caps)
                         return -errno;