From: Karel Zak <kzak@redhat.com>
Date: Tue, 1 Jul 2014 10:32:25 +0000 (+0200)
Subject: libblkid: fix probe_ddf() [clang-analyze]
X-Git-Tag: v2.25-rc2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3438ee8011e262d081534842f83a666c33cc0a3;p=thirdparty%2Futil-linux.git

libblkid: fix probe_ddf() [clang-analyze]

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libblkid/src/superblocks/ddf_raid.c b/libblkid/src/superblocks/ddf_raid.c
index b907a9f8ce..fc2c39d3e5 100644
--- a/libblkid/src/superblocks/ddf_raid.c
+++ b/libblkid/src/superblocks/ddf_raid.c
@@ -110,12 +110,11 @@ static int probe_ddf(blkid_probe pr,
 
 		buf = blkid_probe_get_buffer(pr,
 					lba << 9, sizeof(ddf->signature));
-		if (!buf) {
-			if (errno)
-				return -errno;
-			if (memcmp(buf, &ddf->signature, 4))
-				return 1;
-		}
+		if (!buf)
+			return errno ? -errno : 1;
+
+		if (memcmp(buf, &ddf->signature, 4) != 0)
+			return 1;
 	}
 
 	blkid_probe_strncpy_uuid(pr, ddf->guid, sizeof(ddf->guid));