summaryrefslogtreecommitdiff
path: root/sys/arch/landisk
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2006-10-29 00:02:36 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2006-10-29 00:02:36 +0000
commit6df90c718595732e3d0ba2c392602fffb843655f (patch)
treedbf843085a7c131c5e1af972b81d029d1b6cfe54 /sys/arch/landisk
parent4e0f1e78370ad55cf306abe9f217f5034545699a (diff)
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.
Diffstat (limited to 'sys/arch/landisk')
-rw-r--r--sys/arch/landisk/landisk/disksubr.c13
1 files changed, 5 insertions, 8 deletions
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) {