From: Karel Zak <kzak@redhat.com>
Date: Wed, 27 Mar 2013 15:34:11 +0000 (+0100)
Subject: wipefs: make do_wipe() more readable [coverity scan]
X-Git-Tag: v2.23-rc2~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05ba8c8483a3a2b35989d1059a3dbf1612c0e6e4;p=thirdparty%2Futil-linux.git

wipefs: make do_wipe() more readable [coverity scan]

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

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 156f2143da..ce3d2b816b 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -314,7 +314,7 @@ do_wipe(struct wipe_desc *wp, const char *devname, int noact, int all, int quiet
 {
 	int flags;
 	blkid_probe pr;
-	struct wipe_desc *w, *wp0 = clone_offset(wp);
+	struct wipe_desc *w, *wp0;
 	int zap = all ? 1 : wp->zap;
 
 	flags = O_RDWR;
@@ -324,6 +324,8 @@ do_wipe(struct wipe_desc *wp, const char *devname, int noact, int all, int quiet
 	if (!pr)
 		return NULL;
 
+	wp0 = clone_offset(wp);
+
 	while (blkid_do_probe(pr) == 0) {
 		wp = get_desc_for_probe(wp, pr);
 		if (!wp)