]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tty-ask-password: drop redundant local variable
authorLennart Poettering <lennart@poettering.net>
Tue, 2 Apr 2019 08:07:58 +0000 (10:07 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 2 Apr 2019 08:19:22 +0000 (10:19 +0200)
src/tty-ask-password-agent/tty-ask-password-agent.c

index d4ce904f3fb236198130061e568e293ab77a23b1..4e31eb8b6cfb125fe846ac16aff0be96875c5c3c 100644 (file)
@@ -701,7 +701,6 @@ static int ask_on_this_console(const char *tty, pid_t *ret_pid, char *argv[]) {
                 .sa_handler = nop_signal_handler,
                 .sa_flags = SA_NOCLDSTOP | SA_RESTART,
         };
-        pid_t pid;
         int r;
 
         arguments = strv_copy(argv);
@@ -716,7 +715,7 @@ static int ask_on_this_console(const char *tty, pid_t *ret_pid, char *argv[]) {
         sig.sa_handler = SIG_DFL;
         assert_se(sigaction(SIGHUP, &sig, NULL) >= 0);
 
-        r = safe_fork("(sd-passwd)", FORK_RESET_SIGNALS|FORK_LOG, &pid);
+        r = safe_fork("(sd-passwd)", FORK_RESET_SIGNALS|FORK_LOG, ret_pid);
         if (r < 0)
                 return r;
         if (r == 0) {
@@ -743,7 +742,6 @@ static int ask_on_this_console(const char *tty, pid_t *ret_pid, char *argv[]) {
                 _exit(EXIT_FAILURE);
         }
 
-        *ret_pid = pid;
         return 0;
 }