diff options
| author | bde <bde@FreeBSD.org> | 1999-08-23 23:42:00 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1999-08-23 23:42:00 +0000 |
| commit | b4a4e95f039ea56c8936e63acac099368a5a7e5a (patch) | |
| tree | 0cf7a3fb97b5f5be5358b3915213e26e460b1c5e | |
| parent | 101f12847427aa11f125b55a694322cd3d1297e7 (diff) | |
| download | FreeBSD-src-b4a4e95f039ea56c8936e63acac099368a5a7e5a.zip FreeBSD-src-b4a4e95f039ea56c8936e63acac099368a5a7e5a.tar.gz | |
`bootdev' is an ordinary u_long, so don't cast it to a pointer to print it.
gcc warns about the cast on i386's with 64-bit longs.
Print `bootdev' in all cases when we bail out because it is unreasonable.
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 7 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 1510138..4c5dbd3 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.135 1999/08/22 23:44:33 green Exp $ + * $Id: autoconf.c,v 1.136 1999/08/22 23:49:00 peter Exp $ */ /* @@ -382,15 +382,14 @@ setroot() return; } if ((bootdev & B_MAGICMASK) != B_DEVMAGIC) { - printf("No B_DEVMAGIC\n"); + printf("no B_DEVMAGIC (bootdev=%#lx)\n", bootdev); setconf(); return; } majdev = B_TYPE(bootdev); dev = makebdev(majdev, 0); if (devsw(dev) == NULL) { - printf("No bdevsw (majdev=%d bootdev=%p)\n", majdev, - (void *)bootdev); + printf("no devsw (majdev=%d bootdev=%#lx)\n", majdev, bootdev); setconf(); return; } diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 1510138..4c5dbd3 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.135 1999/08/22 23:44:33 green Exp $ + * $Id: autoconf.c,v 1.136 1999/08/22 23:49:00 peter Exp $ */ /* @@ -382,15 +382,14 @@ setroot() return; } if ((bootdev & B_MAGICMASK) != B_DEVMAGIC) { - printf("No B_DEVMAGIC\n"); + printf("no B_DEVMAGIC (bootdev=%#lx)\n", bootdev); setconf(); return; } majdev = B_TYPE(bootdev); dev = makebdev(majdev, 0); if (devsw(dev) == NULL) { - printf("No bdevsw (majdev=%d bootdev=%p)\n", majdev, - (void *)bootdev); + printf("no devsw (majdev=%d bootdev=%#lx)\n", majdev, bootdev); setconf(); return; } |
