summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-08 18:58:28 +0200
committerSven Eden <yamakuzure@gmx.net>2017-03-29 10:45:09 +0200
commitebbacbdb00c1452efb4a2f4077cf25136879e53d (patch)
tree57c05f327138e22573646f325421afbbc4f7d024
parent5c524c1900f85eb098ad525f80f9c61801fd9366 (diff)
tree-wide: drop redundant if checks before safe_close()
Replace this: if (fd >= 0) safe_close(fd); by this: safe_close(fd);
-rw-r--r--coccinelle/safe_close-no-if.cocci7
-rw-r--r--src/login/logind-button.c4
2 files changed, 8 insertions, 3 deletions
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);