picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Replace this:

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

by this:

        safe_close(fd);
This commit is contained in:
Lennart Poettering 2015-09-08 18:58:28 +02:00
parent 66e405837b
commit 7f6e12b033
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
coccinelle/safe_close-no-if.cocci Normal file
View File

@ -0,0 +1,7 @@
@@
expression fd;
@@
- if (fd >= 0) {
- fd = safe_close(fd);
- }
+ fd = safe_close(fd);

4
src/login/logind-button.c
View File

@ -239,9 +239,7 @@ int button_open(Button *b) {
assert(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); p = strjoina("/dev/input/", b->name);

16
src/udev/udev-event.c
View File

@ -753,12 +753,8 @@ int udev_event_spawn(struct udev_event *event,
char program[UTIL_PATH_SIZE]; char program[UTIL_PATH_SIZE];
/* child closes parent's ends of pipes */ /* child closes parent's ends of pipes */
if (outpipe[READ_END] >= 0) { outpipe[READ_END] = safe_close(outpipe[READ_END]);
outpipe[READ_END] = safe_close(outpipe[READ_END]); errpipe[READ_END] = safe_close(errpipe[READ_END]);
}
if (errpipe[READ_END] >= 0) {
errpipe[READ_END] = safe_close(errpipe[READ_END]);
}
strscpy(arg, sizeof(arg), cmd); strscpy(arg, sizeof(arg), cmd);
udev_build_argv(event->udev, arg, NULL, argv); udev_build_argv(event->udev, arg, NULL, argv);
@ -782,12 +778,8 @@ int udev_event_spawn(struct udev_event *event,
goto out; goto out;
default: default:
/* parent closed child's ends of pipes */ /* parent closed child's ends of pipes */
if (outpipe[WRITE_END] >= 0) { outpipe[WRITE_END] = safe_close(outpipe[WRITE_END]);
outpipe[WRITE_END] = safe_close(outpipe[WRITE_END]); errpipe[WRITE_END] = safe_close(errpipe[WRITE_END]);
}
if (errpipe[WRITE_END] >= 0) {
errpipe[WRITE_END] = safe_close(errpipe[WRITE_END]);
}
spawn_read(event, spawn_read(event,
timeout_usec, timeout_usec,