From d08f3360f435f17590416857a95fa9ccfe19204c Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 28 Jul 2017 14:26:57 +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 files: @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 --- ax25rtd/ax25rtd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'ax25rtd/ax25rtd.c') diff --git a/ax25rtd/ax25rtd.c b/ax25rtd/ax25rtd.c index a40cffe..99630c4 100644 --- a/ax25rtd/ax25rtd.c +++ b/ax25rtd/ax25rtd.c @@ -144,12 +144,14 @@ int main(int argc, char **argv) if (fork()) return 0; - if ((s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25))) == -1) { + s = socket(PF_PACKET, SOCK_PACKET, htons(ETH_P_AX25)); + if (s == -1) { perror("AX.25 socket"); return 1; } - if ((cntrl_s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { + cntrl_s = socket(AF_UNIX, SOCK_STREAM, 0); + if (cntrl_s < 0) { perror("Control socket"); return 1; } @@ -215,10 +217,10 @@ int main(int argc, char **argv) } } } else if (FD_ISSET(cntrl_s, &read_fds)) { - if ((cntrl_fd = - accept(cntrl_s, - (struct sockaddr *) &cntrl_addr, - &cntrl_len)) < 0) { + cntrl_fd = accept(cntrl_s, + (struct sockaddr *)&cntrl_addr, + &cntrl_len); + if (cntrl_fd < 0) { perror("accept Control"); save_cache(); daemon_shutdown(1); -- cgit v1.2.3