d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

`bootdev' is an ordinary u_long, so don't cast it to a pointer to print it.

Browse Source 
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.
This commit is contained in:
Bruce Evans 1999-08-23 23:42:00 +00:00
parent 4c960c5274
commit 709db0871d
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/amd64/amd64/autoconf.c
View File

@ -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;
}

7
sys/i386/i386/autoconf.c
View File

@ -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;
}