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/access.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ax25/access.c') diff --git a/ax25/access.c b/ax25/access.c index 951830c..2ecbb1d 100644 --- a/ax25/access.c +++ b/ax25/access.c @@ -204,7 +204,9 @@ static void write_example_passwd(char *pwfile, char pwlocation, FILE * f; int i; - if ((i = open(pwfile, O_CREAT|O_WRONLY|O_TRUNC, (S_IRUSR | S_IWUSR | (pwlocation == SYSTEMPW ? (S_IRGRP /* | S_IWGRP */ ) : 0)))) == -1) + i = open(pwfile, O_CREAT | O_WRONLY | O_TRUNC, + (S_IRUSR | S_IWUSR | (pwlocation == SYSTEMPW ? (S_IRGRP /* | S_IWGRP */) : 0))); + if (i == -1) return; fchown(i, (pwlocation == SYSTEMPW ? 0 : pw->pw_uid), (pwlocation == SYSTEMPW ? 0 : pw->pw_gid)); close(i); -- cgit v1.2.3