From daba307035faf4cc01f1ccb883b21281d91234cc Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 28 Jul 2017 14:10:07 +0200 Subject: treewide: Kill assignments in if conditions. Somewhat hard to read and the code base already has many overlong lines. Found with below spatch file and some manual editing in ax25/access.c to restore a comment lost by spatch. @parens@ expression E, F, G; binary operator X; statement S; @@ - if ((E = F) X G) + E = F; + if (E X G) S Signed-off-by: Ralf Baechle --- user_call/rose_call.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'user_call/rose_call.c') diff --git a/user_call/rose_call.c b/user_call/rose_call.c index 166307f..7a7dea1 100644 --- a/user_call/rose_call.c +++ b/user_call/rose_call.c @@ -73,7 +73,8 @@ int main(int argc, char **argv) roseconnect.srose_family = rosebind.srose_family = AF_ROSE; roseconnect.srose_ndigis = rosebind.srose_ndigis = 0; - if ((addr = rs_config_get_addr(argv[optind])) == NULL) { + addr = rs_config_get_addr(argv[optind]); + if (addr == NULL) { sprintf(buffer, "ERROR: invalid Rose port name - %s\r", argv[optind]); err(buffer); } @@ -101,7 +102,8 @@ int main(int argc, char **argv) /* * Open the socket into the kernel. */ - if ((s = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) { + s = socket(AF_ROSE, SOCK_SEQPACKET, 0); + if (s < 0) { sprintf(buffer, "ERROR: cannot open Rose socket, %s\r", strerror(errno)); err(buffer); } -- cgit v1.2.3