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 --- ax25/axctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ax25/axctl.c') diff --git a/ax25/axctl.c b/ax25/axctl.c index c27bcdf..942b902 100644 --- a/ax25/axctl.c +++ b/ax25/axctl.c @@ -40,7 +40,8 @@ int main(int argc, char **argv) return 1; } - if ((addr = ax25_config_get_addr(argv[1])) == NULL) { + addr = ax25_config_get_addr(argv[1]); + if (addr == NULL) { fprintf(stderr, "axctl: invalid port name - %s\n", argv[1]); return 1; } @@ -52,7 +53,8 @@ int main(int argc, char **argv) if (ax25_aton_entry(argv[3], (char *)&ax25_ctl.source_addr) == -1) return 1; - if ((s = socket(AF_AX25, SOCK_SEQPACKET, 0)) < 0) { + s = socket(AF_AX25, SOCK_SEQPACKET, 0); + if (s < 0) { perror("axctl: socket"); return 1; } -- cgit v1.2.3