X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flogin%2Flogind-acl.c;h=2df2ba2c17fb0b38f0d3d81efe39390ecda18f2a;hp=390b4b28857f77094ae63020c0d7c6f0f0a27820;hb=d2fe46b514ef3f6e0c0eb16b2d853c6dd6fa1808;hpb=db0c1e3bd39c9151ba4ac8e029ec77a4ec923bd1

diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c
index 390b4b288..2df2ba2c1 100644
--- a/src/login/logind-acl.c
+++ b/src/login/logind-acl.c
@@ -20,15 +20,15 @@
 ***/
 
 #include <assert.h>
-#include <sys/acl.h>
-#include <acl/libacl.h>
 #include <errno.h>
 #include <string.h>
+#include <sys/acl.h>
+#include <acl/libacl.h>
 
-#include "logind-acl.h"
 #include "util.h"
 #include "acl-util.h"
 #include "set.h"
+#include "logind-acl.h"
 
 static int flush_acl(acl_t acl) {
         acl_entry_t i;
@@ -190,9 +190,8 @@ int devnode_acl_all(struct udev *udev,
         assert(udev);
 
         nodes = set_new(string_hash_func, string_compare_func);
-        if (!nodes) {
+        if (!nodes)
                 return -ENOMEM;
-        }
 
         e = udev_enumerate_new(udev);
         if (!e) {
@@ -275,9 +274,9 @@ int devnode_acl_all(struct udev *udev,
 
                         log_debug("Found static node %s for seat %s", n, seat);
                         r = set_put(nodes, n);
-                        if (0 && r < 0 && r != -EEXIST) {
+                        if (r < 0 && r != -EEXIST)
                                 goto finish;
-                        } else
+                        else
                                 r = 0;
                 }
         }