Remove redundant if (msg) {} block around invocations of

iso_disklabelspoof() and udf_disklabelspoof(). Use (msg &&
iso_disklabelspoof()) instead. Makes more arch's textually consistant.
No functional change.

7 files changed, 35 insertions, 54 deletions

diff --git a/sys/arch/amd64/amd64/disksubr.c b/sys/arch/amd64/amd64/disksubr.c
index 1cabcc636a1..fa274029b30 100644
--- a/sys/arch/amd64/amd64/disksubr.c
+++ b/sys/arch/amd64/amd64/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.25 2006/10/28 23:26:05 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.26 2006/10/29 00:02:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -247,17 +247,14 @@ donot:
 		}
 	}
 
-	if (msg) {
 #if defined(CD9660)
-		if (iso_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && iso_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
 #if defined(UDF)
-		if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
-		goto done;
-	}
 
 done:
 	if (bp) {
diff --git a/sys/arch/arm/arm/disksubr.c b/sys/arch/arm/arm/disksubr.c
index e8ae4842ca3..376078e6a71 100644
--- a/sys/arch/arm/arm/disksubr.c
+++ b/sys/arch/arm/arm/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.23 2006/10/28 23:26:05 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.24 2006/10/29 00:02:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -246,17 +246,14 @@ donot:
 		}
 	}
 
-	if (msg) {
 #if defined(CD9660)
-		if (iso_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && iso_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
 #if defined(UDF)
-		if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
-		goto done;
-	}
 
 done:
 	if (bp) {
diff --git a/sys/arch/aviion/aviion/disksubr.c b/sys/arch/aviion/aviion/disksubr.c
index 11aebf5cc78..37fda9ee676 100644
--- a/sys/arch/aviion/aviion/disksubr.c
+++ b/sys/arch/aviion/aviion/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.14 2006/10/28 23:26:05 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.15 2006/10/29 00:02:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -246,16 +246,14 @@ donot:
 		}
 	}
 
-	if (msg) {
 #if defined(CD9660)
-		if (iso_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && iso_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
 #if defined(UDF)
-		if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
-	}
 
 done:
 	if (bp) {
diff --git a/sys/arch/i386/i386/disksubr.c b/sys/arch/i386/i386/disksubr.c
index 81cec55ab01..e06a6abcd5d 100644
--- a/sys/arch/i386/i386/disksubr.c
+++ b/sys/arch/i386/i386/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.67 2006/10/28 23:26:05 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.68 2006/10/29 00:02:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -243,16 +243,14 @@ donot:
 		}
 	}
 
-	if (msg) {
 #if defined(CD9660)
-		if (iso_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && iso_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
 #if defined(UDF)
-		if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
-	}
 
 done:
 	if (bp) {
diff --git a/sys/arch/landisk/landisk/disksubr.c b/sys/arch/landisk/landisk/disksubr.c
index c155ede424f..9ea6931b274 100644
--- a/sys/arch/landisk/landisk/disksubr.c
+++ b/sys/arch/landisk/landisk/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.11 2006/10/28 23:26:05 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.12 2006/10/29 00:02:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -246,17 +246,14 @@ donot:
 		}
 	}
 
-	if (msg) {
 #if defined(CD9660)
-		if (iso_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && iso_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
 #if defined(UDF)
-		if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
-		goto done;
-	}
 
 done:
 	if (bp) {
diff --git a/sys/arch/macppc/macppc/disksubr.c b/sys/arch/macppc/macppc/disksubr.c
index 38406a38546..b018f22abb1 100644
--- a/sys/arch/macppc/macppc/disksubr.c
+++ b/sys/arch/macppc/macppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.33 2006/10/28 23:26:05 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.34 2006/10/29 00:02:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -335,17 +335,14 @@ found_disklabel:
 		}
 	}
 
-	if (msg) {
 #if defined(CD9660)
-		if (iso_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && iso_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
 #if defined(UDF)
-		if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
-		goto done;
-	}
 
 done:
 	bp->b_flags |= B_INVAL;
diff --git a/sys/arch/mvmeppc/mvmeppc/disksubr.c b/sys/arch/mvmeppc/mvmeppc/disksubr.c
index d78c27f05ea..2fdc5192428 100644
--- a/sys/arch/mvmeppc/mvmeppc/disksubr.c
+++ b/sys/arch/mvmeppc/mvmeppc/disksubr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disksubr.c,v 1.29 2006/10/28 23:26:05 krw Exp $	*/
+/*	$OpenBSD: disksubr.c,v 1.30 2006/10/29 00:02:35 krw Exp $	*/
 /*	$NetBSD: disksubr.c,v 1.21 1996/05/03 19:42:03 christos Exp $	*/
 
 /*
@@ -249,17 +249,14 @@ donot:
 		}
 	}
 
-	if (msg) {
 #if defined(CD9660)
-		if (iso_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && iso_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
 #if defined(UDF)
-		if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
-			msg = NULL;
+	if (msg && udf_disklabelspoof(dev, strat, lp) == 0)
+		msg = NULL;
 #endif
-		goto done;
-	}
 
 done:
 	bp->b_flags |= B_INVAL;