From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 30 Jan 2014 23:02:37 +0000 (-0500)
Subject: blkid: suppress Coverity warning
X-Git-Tag: v1.42.10~79
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5397d7ae9d87388201c16d25e0615bd2180cb3f;p=thirdparty%2Fe2fsprogs.git

blkid: suppress Coverity warning

The getopt() function will never let optarg be NULL (at least without
using the GNU double-colon extension, which we don't use because it's
not portable), so don't bother checking for that case.  It's harmless,
but it triggers a Coverity warning elsewhere, since it thinks optarg
could in fact be NULL.

Addresses-Coverity-Id: #1049156

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/misc/blkid.c b/misc/blkid.c
index 55808af80..96fffae49 100644
--- a/misc/blkid.c
+++ b/misc/blkid.c
@@ -293,10 +293,7 @@ int main(int argc, char **argv)
 	while ((c = getopt (argc, argv, "c:f:ghlLo:s:t:w:v")) != EOF)
 		switch (c) {
 		case 'c':
-			if (optarg && !*optarg)
-				read = NULL;
-			else
-				read = optarg;
+			read = optarg;
 			if (!write)
 				write = read;
 			break;
@@ -349,10 +346,7 @@ int main(int argc, char **argv)
 			version = 1;
 			break;
 		case 'w':
-			if (optarg && !*optarg)
-				write = NULL;
-			else
-				write = optarg;
+			write = optarg;
 			break;
 		case 'h':
 			err = 0;