[PATCH 06/10] staging: usbip: userspace: libsrc: removed assignments in if conditions
Kurt Kanzenbach
ly80toro at cip.cs.fau.de
Fri Feb 22 11:13:30 UTC 2013
This patch fixes the following checkpatch error:
-ERROR: do not use assignment in if condition
Signed-off-by: Kurt Kanzenbach <ly80toro at cip.cs.fau.de>
---
drivers/staging/usbip/userspace/libsrc/names.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/usbip/userspace/libsrc/names.c b/drivers/staging/usbip/userspace/libsrc/names.c
index a66f539..3b151df 100644
--- a/drivers/staging/usbip/userspace/libsrc/names.c
+++ b/drivers/staging/usbip/userspace/libsrc/names.c
@@ -491,9 +491,11 @@ static void parse(FILE *f)
while (fgets(buf, sizeof(buf), f)) {
linectr++;
/* remove line ends */
- if ((cp = strchr(buf, 13)))
+ cp = strchr(buf, 13);
+ if (cp)
*cp = 0;
- if ((cp = strchr(buf, 10)))
+ cp = strchr(buf, 10);
+ if (cp)
*cp = 0;
if (buf[0] == '#' || !buf[0])
continue;
@@ -857,9 +859,10 @@ int names_init(char *n)
{
FILE *f;
- if (!(f = fopen(n, "r"))) {
+ f = fopen(n, "r");
+ if (!f)
return errno;
- }
+
parse(f);
fclose(f);
return 0;
--
1.7.10.4
More information about the devel
mailing list