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

tree-wide: make more code use safe_close() 

Replace this:

        close(fd);
        fd = -1;

write this:

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

18
coccinelle/safe_close.cocci Normal file
View File

@ -0,0 +1,18 @@
@@
expression fd;
@@
- close(fd);
- fd = -1;
+ fd = safe_close(fd);
@@
expression fd;
@@
- close_nointr(fd);
- fd = -1;
+ fd = safe_close(fd);
@@
expression fd;
@@
- safe_close(fd);
- fd = -1;
+ fd = safe_close(fd);

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

@ -240,8 +240,7 @@ int button_open(Button *b) {
assert(b);
if (b->fd >= 0) {
close(b->fd);
b->fd = -1;
b->fd = safe_close(b->fd);
}
p = strjoina("/dev/input/", b->name);
@ -267,8 +266,7 @@ int button_open(Button *b) {
return 0;
fail:
close(b->fd);
b->fd = -1;
b->fd = safe_close(b->fd);
return r;
}

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

@ -754,12 +754,10 @@ int udev_event_spawn(struct udev_event *event,
/* child closes parent's ends of pipes */
if (outpipe[READ_END] >= 0) {
close(outpipe[READ_END]);
outpipe[READ_END] = -1;
outpipe[READ_END] = safe_close(outpipe[READ_END]);
}
if (errpipe[READ_END] >= 0) {
close(errpipe[READ_END]);
errpipe[READ_END] = -1;
errpipe[READ_END] = safe_close(errpipe[READ_END]);
}
strscpy(arg, sizeof(arg), cmd);
@ -785,12 +783,10 @@ int udev_event_spawn(struct udev_event *event,
default:
/* parent closed child's ends of pipes */
if (outpipe[WRITE_END] >= 0) {
close(outpipe[WRITE_END]);
outpipe[WRITE_END] = -1;
outpipe[WRITE_END] = safe_close(outpipe[WRITE_END]);
}
if (errpipe[WRITE_END] >= 0) {
close(errpipe[WRITE_END]);
errpipe[WRITE_END] = -1;
errpipe[WRITE_END] = safe_close(errpipe[WRITE_END]);
}
spawn_read(event,