tree-wide: don't do assignments within if checks

Turn this:

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

into this:

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

diff --git a/coccinelle/no-if-assignments.cocci b/coccinelle/no-if-assignments.cocci
new file mode 100644 (file)
index 0000000..9f63e90
--- /dev/null
+++ b/coccinelle/no-if-assignments.cocci
@@ -0,0 +1,20 @@
+@@
+expression p, q;
+identifier r;
+statement s;
+@@
+- if ((r = q) < p)
+- s
++ r = q;
++ if (r < p)
++ s
+@@
+expression p, q;
+identifier r;
+statement s;
+@@
+- if ((r = q) >= p)
+- s
++ r = q;
++ if (r >= p)
++ s

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 2cbed293ba65a9ff1dbc69e96f345b1550522ae6..abfd545c791e0bc10bcbd698cbdc8812b2a8997e 100644 (file)
--- 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) {

diff --git a/src/basic/fdset.c b/src/basic/fdset.c
index a4823e6659623602d71227929e797d83d87e38ef..d70fe156a26044a3940920b1a8f20edf2f5b2fdc 100644 (file)
--- a/src/basic/fdset.c
+++ b/src/basic/fdset.c
@@ -201,9 +201,11 @@ int fdset_cloexec(FDSet *fds, bool b) {
 
         assert(fds);
 
-        SET_FOREACH(p, MAKE_SET(fds), i)
-                if ((r = fd_cloexec(PTR_TO_FD(p), b)) < 0)
+        SET_FOREACH(p, MAKE_SET(fds), i) {
+                r = fd_cloexec(PTR_TO_FD(p), b);
+                if (r < 0)
                         return r;
+        }
 
         return 0;
 }

diff --git a/src/core/execute.c b/src/core/execute.c
index de5c16bd766731d92a0ce714c30774c9b09fe606..3e20130f0ec3429f3126386bed208932b25e13de 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -122,7 +122,8 @@ static int shift_fds(int fds[], unsigned n_fds) {
                         if (fds[i] == i+3)
                                 continue;
 
-                        if ((nfd = fcntl(fds[i], F_DUPFD, i+3)) < 0)
+                        nfd = fcntl(fds[i], F_DUPFD, i + 3);
+                        if (nfd < 0)
                                 return -errno;
 
                         safe_close(fds[i]);
@@ -156,14 +157,16 @@ static int flags_fds(const int fds[], unsigned n_fds, bool nonblock) {
 
         for (i = 0; i < n_fds; i++) {
 
-                if ((r = fd_nonblock(fds[i], nonblock)) < 0)
+                r = fd_nonblock(fds[i], nonblock);
+                if (r < 0)
                         return r;
 
                 /* We unconditionally drop FD_CLOEXEC from the fds,
                  * since after all we want to pass these fds to our
                  * children */
 
-                if ((r = fd_cloexec(fds[i], false)) < 0)
+                r = fd_cloexec(fds[i], false);
+                if (r < 0)
                         return r;
         }
 
@@ -315,7 +318,8 @@ static int open_terminal_as(const char *path, mode_t mode, int nfd) {
         assert(path);
         assert(nfd >= 0);
 
-        if ((fd = open_terminal(path, mode | O_NOCTTY)) < 0)
+        fd = open_terminal(path, mode | O_NOCTTY);
+        if (fd < 0)
                 return fd;
 
         if (fd != nfd) {
@@ -629,7 +633,8 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_
                 if (context->group) {
                         const char *g = context->group;
 
-                        if ((r = get_group_creds(&g, &gid)) < 0)
+                        r = get_group_creds(&g, &gid);
+                        if (r < 0)
                                 return r;
                 }
 
@@ -658,7 +663,8 @@ static int enforce_groups(const ExecContext *context, const char *username, gid_
                         return -ENOMEM;
 
                 if (keep_groups) {
-                        if ((k = getgroups(ngroups_max, gids)) < 0) {
+                        k = getgroups(ngroups_max, gids);
+                        if (k < 0) {
                                 free(gids);
                                 return -errno;
                         }

diff --git a/src/core/socket.c b/src/core/socket.c
index 7d3d5eb78a01acd9fd72d78d8126dafc6f0b2b15..9db42a033310c53e3f53dcae2bb14a393ec1ad06 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -982,7 +982,9 @@ static int fifo_address_create(
                 goto fail;
         }
 
-        if ((fd = open(path, O_RDWR|O_CLOEXEC|O_NOCTTY|O_NONBLOCK|O_NOFOLLOW)) < 0) {
+        fd = open(path,
+                  O_RDWR | O_CLOEXEC | O_NOCTTY | O_NONBLOCK | O_NOFOLLOW);
+        if (fd < 0) {
                 r = -errno;
                 goto fail;
         }

diff --git a/src/core/transaction.c b/src/core/transaction.c
index 090103fbdad76a2c6c0632e311cdd910afda33e6..b505297e238318fb6e07847c649a3304c1c4c87e 100644 (file)
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -464,9 +464,11 @@ static int transaction_verify_order(Transaction *tr, unsigned *generation, sd_bu
 
         g = (*generation)++;
 
-        HASHMAP_FOREACH(j, tr->jobs, i)
-                if ((r = transaction_verify_order_one(tr, j, NULL, g, e)) < 0)
+        HASHMAP_FOREACH(j, tr->jobs, i) {
+                r = transaction_verify_order_one(tr, j, NULL, g, e);
+                if (r < 0)
                         return r;
+        }
 
         return 0;
 }

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index 19d6468fcc0c8999aec43c31c239c1c900df78da..087cc2f7d6b85698d3a369e6fa2c0e7b2790b769 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -399,13 +399,10 @@ int main(int argc, char *argv[]) {
                 struct epoll_event event;
                 int k;
 
-                if ((k = epoll_wait(server.epoll_fd,
-                                    &event, 1,
-                                    TIMEOUT_MSEC)) < 0) {
-
+                k = epoll_wait(server.epoll_fd, &event, 1, TIMEOUT_MSEC);
+                if (k < 0) {
                         if (errno == EINTR)
                                 continue;
-
                         log_error_errno(errno, "epoll_wait() failed: %m");
                         goto fail;
                 }

diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c
index c03bda43829ec91b1af66bb6bb48e5cc6e2a9c01..e3e5a95add29c597e024f20e4b0571bafd52f8e3 100644 (file)
--- a/src/test/test-loopback.c
+++ b/src/test/test-loopback.c
@@ -31,7 +31,8 @@ int main(int argc, char* argv[]) {
         log_open();
         log_parse_environment();
 
-        if ((r = loopback_setup()) < 0)
+        r = loopback_setup();
+        if (r < 0)
                 fprintf(stderr, "loopback: %s\n", strerror(-r));
 
         return 0;