diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2017-07-28 14:10:07 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2017-07-31 04:29:44 +0200 |
commit | daba307035faf4cc01f1ccb883b21281d91234cc (patch) | |
tree | edbd5df9285303f281524fac8064866057ce35ce /netrom/nrparms.c | |
parent | 71b0582584ac5de97141ea207ddf17f7c938b2df (diff) |
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 <ralf@linux-mips.org>
Diffstat (limited to 'netrom/nrparms.c')
-rw-r--r-- | netrom/nrparms.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/netrom/nrparms.c b/netrom/nrparms.c index 5583dd8..9c6a5d2 100644 --- a/netrom/nrparms.c +++ b/netrom/nrparms.c @@ -98,7 +98,8 @@ static void nodes(int s, char *nodecall, char *op, char *ident, int quality, nr_node.ndigis++; } - if ((dev = ax25_config_get_dev(port)) == NULL) { + dev = ax25_config_get_dev(port); + if (dev == NULL) { fprintf(stderr, "nrparms: nodes: invalid port name - %s\n", port); close(s); exit(1); @@ -162,7 +163,8 @@ static void routes(int s, char *port, char *nodecall, char *rest[]) exit(1); } - if ((dev = ax25_config_get_dev(port)) == NULL) { + dev = ax25_config_get_dev(port); + if (dev == NULL) { fprintf(stderr, "nrparms: routes: invalid port name - %s\n", port); close(s); exit(1); @@ -207,7 +209,8 @@ int main(int argc, char *argv[]) return 0; } - if ((s = socket(AF_NETROM, SOCK_SEQPACKET, 0)) < 0) { + s = socket(AF_NETROM, SOCK_SEQPACKET, 0); + if (s < 0) { perror("nrparms: socket"); return 1; } |