diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-02-15 00:53:27 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2007-02-15 00:53:27 +0000 |
| commit | 95282b6858723d99be5ee46ba619aaaaf5c3aadd (patch) | |
| tree | 1f216ad3bfeb5ecbce45f9779c3d3c4fc87ba8e1 /sys/dev | |
| parent | 36dca6184bb3cf55c9ec2fa4270d3a9f57bc7ecc (diff) | |
Don't print the error strings returned by readdisklabel(). If you
need the debug info uncomment the printf's you need. Crude but
effective way to suppress 'no disklabel' errors that pop up at the
most innconvenient times to frighten users. More elegant method,
DPRINTF-like constructs or something, later.
"Yay!" marco@ ok deraadt@
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/wd.c | 4 | ||||
| -rw-r--r-- | sys/dev/flash.c | 7 | ||||
| -rw-r--r-- | sys/dev/isa/fd.c | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_openbsdkintf.c | 4 |
4 files changed, 10 insertions, 9 deletions
diff --git a/sys/dev/ata/wd.c b/sys/dev/ata/wd.c index 7b837ba1896..75814b4b3b4 100644 --- a/sys/dev/ata/wd.c +++ b/sys/dev/ata/wd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wd.c,v 1.52 2007/02/06 03:17:24 krw Exp $ */ +/* $OpenBSD: wd.c,v 1.53 2007/02/15 00:53:26 krw Exp $ */ /* $NetBSD: wd.c,v 1.193 1999/02/28 17:15:27 explorer Exp $ */ /* @@ -853,7 +853,7 @@ wdgetdisklabel(dev_t dev, struct wd_softc *wd, struct disklabel *lp, wdstrategy, lp, clp, spoofonly); } if (errstring) { - printf("%s: %s\n", wd->sc_dev.dv_xname, errstring); + /*printf("%s: %s\n", wd->sc_dev.dv_xname, errstring);*/ return; } diff --git a/sys/dev/flash.c b/sys/dev/flash.c index 0fa721463e2..ed46c3f6c00 100644 --- a/sys/dev/flash.c +++ b/sys/dev/flash.c @@ -1,4 +1,4 @@ -/* $OpenBSD: flash.c,v 1.1 2006/11/25 14:32:00 uwe Exp $ */ +/* $OpenBSD: flash.c,v 1.2 2007/02/15 00:53:26 krw Exp $ */ /* * Copyright (c) 2005 Uwe Stuehler <uwe@openbsd.org> @@ -1030,8 +1030,9 @@ flashgetdisklabel(dev_t dev, struct flash_softc *sc, labeldev = flashlabeldev(dev); errstring = readdisklabel(labeldev, flashstrategy, lp, clp, spoofonly); - if (errstring != NULL) - printf("%s: %s\n", sc->sc_dev.dv_xname, errstring); + if (errstring != NULL) { + /*printf("%s: %s\n", sc->sc_dev.dv_xname, errstring);*/ + } } /* diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 89722be6b6e..00be031c20e 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fd.c,v 1.59 2007/02/14 00:53:48 jsg Exp $ */ +/* $OpenBSD: fd.c,v 1.60 2007/02/15 00:53:26 krw Exp $ */ /* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */ /*- @@ -997,7 +997,7 @@ fdioctl(dev, cmd, addr, flag, p) errstring = readdisklabel(dev, fdstrategy, lp, &cdl, 0); if (errstring) { - /*printf("%s: %s\n", fd->sc_dev.dv_xname, errstring); */ + /*printf("%s: %s\n", fd->sc_dev.dv_xname, errstring);*/ } *(struct disklabel *)addr = *lp; diff --git a/sys/dev/raidframe/rf_openbsdkintf.c b/sys/dev/raidframe/rf_openbsdkintf.c index 30301ffc157..d1e294f06cb 100644 --- a/sys/dev/raidframe/rf_openbsdkintf.c +++ b/sys/dev/raidframe/rf_openbsdkintf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rf_openbsdkintf.c,v 1.33 2006/03/05 21:48:56 miod Exp $ */ +/* $OpenBSD: rf_openbsdkintf.c,v 1.34 2007/02/15 00:53:26 krw Exp $ */ /* $NetBSD: rf_netbsdkintf.c,v 1.109 2001/07/27 03:30:07 oster Exp $ */ /*- @@ -2155,7 +2155,7 @@ raidgetdisklabel(dev_t dev) errstring = readdisklabel(RAIDLABELDEV(dev), raidstrategy, lp, rs->sc_dkdev.dk_cpulabel, 0); if (errstring) { - printf("%s: %s\n", rs->sc_xname, errstring); + /*printf("%s: %s\n", rs->sc_xname, errstring);*/ return; /*raidmakedisklabel(rs);*/ } |