summaryrefslogtreecommitdiffstats
path: root/rose/rsparms.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2017-07-28 14:10:07 +0200
committerRalf Baechle <ralf@linux-mips.org>2017-07-31 04:29:44 +0200
commitdaba307035faf4cc01f1ccb883b21281d91234cc (patch)
treeedbd5df9285303f281524fac8064866057ce35ce /rose/rsparms.c
parent71b0582584ac5de97141ea207ddf17f7c938b2df (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 'rose/rsparms.c')
-rw-r--r--rose/rsparms.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/rose/rsparms.c b/rose/rsparms.c
index f975070..419c5ed 100644
--- a/rose/rsparms.c
+++ b/rose/rsparms.c
@@ -31,7 +31,8 @@ static void printnb(char *neigh)
char buff[80];
int args;
- if ((fp=fopen(PROC_RS_NEIGH_FILE,"r"))==NULL) {
+ fp = fopen(PROC_RS_NEIGH_FILE, "r");
+ if (fp == NULL) {
fprintf(stderr,"rsparms: Couldn't open %s file\n",PROC_RS_NEIGH_FILE);
exit(1);
}
@@ -86,7 +87,8 @@ static void nodes(int s, int argc, char *argv[])
}
if (argv[2][0] == 'l') {
- if ((fn=fopen(PROC_RS_NODES_FILE,"r"))==NULL) {
+ fn = fopen(PROC_RS_NODES_FILE, "r");
+ if (fn == NULL) {
fprintf(stderr,"rsparms: Couldn't open %s file\n",PROC_RS_NODES_FILE);
exit(1);
}
@@ -153,7 +155,8 @@ static void nodes(int s, int argc, char *argv[])
exit(1);
}
- if ((dev = ax25_config_get_dev(argv[4])) == NULL) {
+ dev = ax25_config_get_dev(argv[4]);
+ if (dev == NULL) {
fprintf(stderr, "rsparms: nodes: invalid port name - %s\n", argv[4]);
close(s);
exit(1);
@@ -225,7 +228,8 @@ int main(int argc, char *argv[])
rose_call = null_ax25_address;
}
- if ((s = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) {
+ s = socket(AF_ROSE, SOCK_SEQPACKET, 0);
+ if (s < 0) {
perror("rsparms: socket");
return 1;
}
@@ -243,7 +247,8 @@ int main(int argc, char *argv[])
if (strncmp(argv[1], "-n", 2) == 0) {
- if ((s = socket(AF_ROSE, SOCK_SEQPACKET, 0)) < 0) {
+ s = socket(AF_ROSE, SOCK_SEQPACKET, 0);
+ if (s < 0) {
perror("rsparms: socket");
return 1;
}