chiark / gitweb /
fsck: use _cleanup_close_pair_ where appropriate
authorLennart Poettering <lennart@poettering.net>
Mon, 9 Mar 2015 18:50:37 +0000 (19:50 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 9 Mar 2015 18:50:37 +0000 (19:50 +0100)
src/fsck/fsck.c
src/fsckd/fsckd.c

index a4a15da..f3e90a8 100644 (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;
         _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;
 
         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 */
                 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 */
         }
                 execv(cmdline[0], (char**) cmdline);
                 _exit(8); /* Operational error */
         }
@@ -373,7 +373,5 @@ int main(int argc, char *argv[]) {
                 touch("/run/systemd/quotacheck");
 
 finish:
                 touch("/run/systemd/quotacheck");
 
 finish:
-        safe_close_pair(progress_pipe);
-
         return r;
 }
         return r;
 }
index 1415b53..dedc828 100644 (file)
@@ -82,6 +82,7 @@ typedef struct Manager {
         sd_event_source *connection_event_source;
 
         FILE *console;
         sd_event_source *connection_event_source;
 
         FILE *console;
+
         double percent;
         int numdevices;
 
         double percent;
         int numdevices;