util: replace close_pipe() with new safe_close_pair()

[elogind.git] / src / journal / journal-remote.c

diff --git a/src/journal/journal-remote.c b/src/journal/journal-remote.c
index 469735663cf85b5b79d1e7164b34bb80d7fc2510..4ece14ee777b9ce9138cc6bfc0fabf851c2ea827 100644 (file)
--- a/src/journal/journal-remote.c
+++ b/src/journal/journal-remote.c
@@ -89,7 +89,7 @@ static int spawn_child(const char* child, char** argv) {
         if (child_pid < 0) {
                 r = -errno;
                 log_error("Failed to fork: %m");
         if (child_pid < 0) {
                 r = -errno;
                 log_error("Failed to fork: %m");

-                close_pipe(fd);
+                safe_close_pair(fd);

                 return r;
         }
 
                 return r;
         }
 


@@ -101,9 +101,7 @@ static int spawn_child(const char* child, char** argv) {
                         _exit(EXIT_FAILURE);
                 }
 
                         _exit(EXIT_FAILURE);
                 }
 

-                r = close_pipe(fd);
-                if (r < 0)
-                        log_warning("Failed to close pipe fds: %m");
+                safe_close_pair(fd);

 
                 /* Make sure the child goes away when the parent dies */
                 if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)
 
                 /* Make sure the child goes away when the parent dies */
                 if (prctl(PR_SET_PDEATHSIG, SIGTERM) < 0)