diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-18 02:14:18 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-18 02:14:18 +0000 |
| commit | 9b6397660b3b38e02233bb576074232aa5080c1a (patch) | |
| tree | 0efb0fd4ce24c87b36e2f845e9906bc9d83031c6 /sys/arch | |
| parent | 021d071fde0e3998260ca886b1e01df6ad6eabe1 (diff) | |
msg is already gauranteed to be NULL
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc/sparc/disksubr.c | 10 | ||||
| -rw-r--r-- | sys/arch/sparc64/sparc64/disksubr.c | 10 |
2 files changed, 6 insertions, 14 deletions
diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c index c37f39a5bb2..79d1b2fabec 100644 --- a/sys/arch/sparc/sparc/disksubr.c +++ b/sys/arch/sparc/sparc/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.64 2007/06/17 00:27:29 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.65 2007/06/18 02:14:17 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.16 1996/04/28 20:25:59 thorpej Exp $ */ /* @@ -86,16 +86,12 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), #if NCD > 0 if (strat == cdstrategy) { #if defined(CD9660) - if (iso_disklabelspoof(dev, strat, lp) == 0) { - msg = NULL; + if (iso_disklabelspoof(dev, strat, lp) == 0) goto done; - } #endif #if defined(UDF) - if (udf_disklabelspoof(dev, strat, lp) == 0) { - msg = NULL; + if (udf_disklabelspoof(dev, strat, lp) == 0) goto done; - } #endif } #endif /* NCD > 0 */ diff --git a/sys/arch/sparc64/sparc64/disksubr.c b/sys/arch/sparc64/sparc64/disksubr.c index ae0475e8e14..7b166e37fc5 100644 --- a/sys/arch/sparc64/sparc64/disksubr.c +++ b/sys/arch/sparc64/sparc64/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.43 2007/06/17 00:27:29 deraadt Exp $ */ +/* $OpenBSD: disksubr.c,v 1.44 2007/06/18 02:14:17 deraadt Exp $ */ /* $NetBSD: disksubr.c,v 1.13 2000/12/17 22:39:18 pk Exp $ */ /* @@ -79,16 +79,12 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), #if NCD > 0 if (strat == cdstrategy) { #if defined(CD9660) - if (iso_disklabelspoof(dev, strat, lp) == 0) { - msg = NULL; + if (iso_disklabelspoof(dev, strat, lp) == 0) goto done; - } #endif #if defined(UDF) - if (udf_disklabelspoof(dev, strat, lp) == 0) { - msg = NULL; + if (udf_disklabelspoof(dev, strat, lp) == 0) goto done; - } #endif } #endif /* NCD > 0 */ |