From 3cc2aff1abff9e34f9fec282d970204dc1eab6f1 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 8 Sep 2015 19:14:10 +0200
Subject: tree-wide: don't do assignments within if checks

Turn this:

       if ((r = foo()) < 0) { ...

into this:

       r = foo();
       if (r < 0) { ...
---
 src/ask-password/ask-password.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/ask-password')

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) {
-- 
cgit v1.2.3-54-g00ecf