shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-02-03 13:47:04 +03:00
Code

fsck: use _cleanup_close_pair_ where appropriate

Browse Source
This commit is contained in:
Lennart Poettering 2015-03-09 19:50:37 +01:00
parent 57b394b505
commit 1952708abb
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fsck/fsck.c
View File

@ -203,7 +203,7 @@ int main(int argc, char *argv[]) {
_cleanup_udev_device_unref_ struct udev_device *udev_device = NULL;
const char *device, *type;
bool root_directory;
int progress_pipe[2] = { -1, -1 };
_cleanup_close_pair_ int progress_pipe[2] = { -1, -1 };
char dash_c[sizeof("-C")-1 + DECIMAL_STR_MAX(int) + 1];
struct stat st;
@ -328,7 +328,7 @@ int main(int argc, char *argv[]) {
goto finish;
} else if (pid == 0) {
/* Child */
safe_close(progress_pipe[0]);
progress_pipe[0] = safe_close(progress_pipe[0]);
execv(cmdline[0], (char**) cmdline);
_exit(8); /* Operational error */
}
@ -373,7 +373,5 @@ int main(int argc, char *argv[]) {
touch("/run/systemd/quotacheck");
finish:
safe_close_pair(progress_pipe);
return r;
}

1
src/fsckd/fsckd.c
View File

@ -82,6 +82,7 @@ typedef struct Manager {
sd_event_source *connection_event_source;
FILE *console;
double percent;
int numdevices;