From: Karel Zak <kzak@redhat.com>
Date: Mon, 16 Feb 2015 10:02:53 +0000 (+0100)
Subject: fsck: fix compiler warning [-Wlogical-not-parentheses]
X-Git-Tag: v2.26~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b1bb2839935714e0ffe836de67c8ae9ffc43004;p=thirdparty%2Futil-linux.git

fsck: fix compiler warning [-Wlogical-not-parentheses]

Reported-by: Ruediger Meier <sweet_f_a@gmx.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 78ad43e2d1..5842da4085 100644
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -1464,14 +1464,13 @@ static void parse_argv(int argc, char *argv[])
 				break;
 			case 'C':
 				progress = 1;
-				if (arg[j+1]) {
+				if (arg[j+1]) {					/* -C<fd> */
 					progress_fd = string_to_int(arg+j+1);
 					if (progress_fd < 0)
 						progress_fd = 0;
 					else
 						goto next_arg;
-				} else if ((i+1) < argc &&
-					   !strncmp(argv[i+1], "-", 1) == 0) {
+				} else if (i+1 < argc && *argv[i+1] != '-') {	/* -C <fd> */
 					progress_fd = string_to_int(argv[i]);
 					if (progress_fd < 0)
 						progress_fd = 0;