diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-09-08 19:14:10 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-09-09 08:20:20 +0200 |
| commit | 3cc2aff1abff9e34f9fec282d970204dc1eab6f1 (patch) | |
| tree | 39d4b5f8f9980aeacaf64b4c3078f51a46a3b63e /src/ask-password/ask-password.c | |
| parent | 7f6e12b03300ba3e473ce6b85d823fc0375b335e (diff) | |
tree-wide: don't do assignments within if checks
Turn this:
if ((r = foo()) < 0) { ...
into this:
r = foo();
if (r < 0) { ...
Diffstat (limited to 'src/ask-password/ask-password.c')
| -rw-r--r-- | src/ask-password/ask-password.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index 2cbed293ba..abfd545c79 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -156,7 +156,9 @@ int main(int argc, char *argv[]) { if (arg_use_tty && isatty(STDIN_FILENO)) { char *password = NULL; - if ((r = ask_password_tty(arg_message, timeout, arg_echo, NULL, &password)) >= 0) { + r = ask_password_tty(arg_message, timeout, arg_echo, NULL, + &password); + if (r >= 0) { puts(password); free(password); } @@ -164,7 +166,9 @@ int main(int argc, char *argv[]) { } else { char **l; - if ((r = ask_password_agent(arg_message, arg_icon, arg_id, timeout, arg_echo, arg_accept_cached, &l)) >= 0) { + r = ask_password_agent(arg_message, arg_icon, arg_id, timeout, + arg_echo, arg_accept_cached, &l); + if (r >= 0) { char **p; STRV_FOREACH(p, l) { |