diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-29 00:02:36 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-29 00:02:36 +0000 |
| commit | 6df90c718595732e3d0ba2c392602fffb843655f (patch) | |
| tree | dbf843085a7c131c5e1af972b81d029d1b6cfe54 /sys/arch/arm | |
| parent | 4e0f1e78370ad55cf306abe9f217f5034545699a (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/arm')
| -rw-r--r-- | sys/arch/arm/arm/disksubr.c | 13 |
1 files changed, 5 insertions, 8 deletions
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) { |