From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Sep 2015 16:58:28 +0000 (+0200)
Subject: tree-wide: drop redundant if checks before safe_close()
X-Git-Tag: v227.2^2~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ebbacbdb00c1452efb4a2f4077cf25136879e53d

tree-wide: drop redundant if checks before safe_close()

Replace this:

        if (fd >= 0)
                safe_close(fd);

by this:

        safe_close(fd);
---

diff --git a/coccinelle/safe_close-no-if.cocci b/coccinelle/safe_close-no-if.cocci
new file mode 100644
index 000000000..81c567851
--- /dev/null
+++ b/coccinelle/safe_close-no-if.cocci
@@ -0,0 +1,7 @@
+@@
+expression fd;
+@@
+- if (fd >= 0) {
+- fd = safe_close(fd);
+- }
++ fd = safe_close(fd);
diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index 3324c4622..92c1b6795 100644
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -239,9 +239,7 @@ int button_open(Button *b) {
 
         assert(b);
 
-        if (b->fd >= 0) {
-                b->fd = safe_close(b->fd);
-        }
+        b->fd = safe_close(b->fd);
 
         p = strjoina("/dev/input/", b->name);