tree-wide: port various places to use TAKE_PID()

2021-11-03 16:36:09 +01:00
parent 883946f0d2
commit 8f03de5323
14 changed files with 18 additions and 33 deletions
@@ -2248,8 +2248,7 @@ static int setup_private_users(uid_t ouid, gid_t ogid, uid_t uid, gid_t gid) {
        if (n != 0) /* on success we should have read 0 bytes */
                return -EIO;

-        r = wait_for_terminate_and_check("(sd-userns)", pid, 0);
-        pid = 0;
+        r = wait_for_terminate_and_check("(sd-userns)", TAKE_PID(pid), 0);
        if (r < 0)
                return r;
        if (r != EXIT_SUCCESS) /* If something strange happened with the child, let's consider this fatal, too */