util: replace close_nointr_nofail() by a more useful safe_close()

[elogind.git] / src / readahead / readahead-collect.c

diff --git a/src/readahead/readahead-collect.c b/src/readahead/readahead-collect.c
index be920062dc93cde65d617b7bfba4d3e0e02d87f5..c1afd0d605226259a74ac458601faa2f886a5544 100644 (file)
--- a/src/readahead/readahead-collect.c
+++ b/src/readahead/readahead-collect.c
@@ -176,8 +176,7 @@ finish:
         if (start != MAP_FAILED)
                 munmap(start, l);
 
         if (start != MAP_FAILED)
                 munmap(start, l);
 

-        if (fd >= 0)
-                close_nointr_nofail(fd);
+        safe_close(fd);

 
         return r;
 }
 
         return r;
 }


@@ -493,16 +492,12 @@ static int collect(const char *root) {
                                 log_warning("readlink(%s) failed: %s", fn, strerror(-k));
 
                 next_iteration:
                                 log_warning("readlink(%s) failed: %s", fn, strerror(-k));
 
                 next_iteration:

-                        if (m->fd >= 0)
-                                close_nointr_nofail(m->fd);
+                        safe_close(m->fd);

                 }
         }
 
 done:
                 }
         }
 
 done:

-        if (fanotify_fd >= 0) {
-                close_nointr_nofail(fanotify_fd);
-                fanotify_fd = -1;
-        }
+        fanotify_fd = safe_close(fanotify_fd);

 
         log_debug("Writing Pack File...");
 
 
         log_debug("Writing Pack File...");
 


@@ -592,14 +587,9 @@ done:
         log_debug("Done.");
 
 finish:
         log_debug("Done.");
 
 finish:

-        if (fanotify_fd >= 0)
-                close_nointr_nofail(fanotify_fd);
-
-        if (signal_fd >= 0)
-                close_nointr_nofail(signal_fd);
-
-        if (inotify_fd >= 0)
-                close_nointr_nofail(inotify_fd);
+        safe_close(fanotify_fd);
+        safe_close(signal_fd);
+        safe_close(inotify_fd);

 
         if (pack) {
                 fclose(pack);
 
         if (pack) {
                 fclose(pack);