process-util: make wait_for_terminate() as trivial wrapper of its PidRef version

diff --git a/src/basic/process-util.c b/src/basic/process-util.c
index df547ccada3fac0f15c1e71a590bed7f83027deb..d3c43c3ba4e784157f6002d6643c8911d58c56ac 100644 (file)
--- a/src/basic/process-util.c
+++ b/src/basic/process-util.c
@@ -879,27 +879,8 @@ int get_process_umask(pid_t pid, mode_t *ret) {
         return parse_mode(m, ret);
 }
 
-int wait_for_terminate(pid_t pid, siginfo_t *status) {
-        siginfo_t dummy;
-
-        assert(pid >= 1);
-
-        if (!status)
-                status = &dummy;
-
-        for (;;) {
-                zero(*status);
-
-                if (waitid(P_PID, pid, status, WEXITED) < 0) {
-
-                        if (errno == EINTR)
-                                continue;
-
-                        return negative_errno();
-                }
-
-                return 0;
-        }
+int wait_for_terminate(pid_t pid, siginfo_t *ret) {
+        return pidref_wait_for_terminate(&PIDREF_MAKE_FROM_PID(pid), ret);
 }
 
 /*

diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 910fc604cd3bf043dc29e708e897dd71802489a9..fd24ee41ce2aec8534f45ef3734112988c35f110 100644 (file)
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -65,7 +65,7 @@ static inline bool SIGINFO_CODE_IS_DEAD(int code) {
         return IN_SET(code, CLD_EXITED, CLD_KILLED, CLD_DUMPED);
 }
 
-int wait_for_terminate(pid_t pid, siginfo_t *status);
+int wait_for_terminate(pid_t pid, siginfo_t *ret);
 
 typedef enum WaitFlags {
         WAIT_LOG_ABNORMAL             = 1 << 0,