Fix -Wformat warnings, still need to do something about %b and pointer

type args.
This commit is contained in:
Rodney W. Grimes 1995-05-09 12:26:00 +00:00
parent 14b77878bb
commit 2d9d0204f7
9 changed files with 35 additions and 31 deletions

View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.58 1995/04/20 03:17:44 julian Exp $
* $Id: fd.c,v 1.59 1995/05/06 19:34:25 joerg Exp $
*
*/
@ -693,7 +693,7 @@ fdattach(struct isa_device *dev)
fd->fdc = fdc;
fd->fdsu = fdsu;
fd->options = 0;
printf("fd%d: ", fdsu, fdu);
printf("fd%d: ", fdu);
fd_registerdev(fdcu, fdu);
switch (fdt) {
@ -1417,7 +1417,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
{
printf(
"fd%d: Seek to cyl %d failed; am at cyl %d (ST0 = 0x%x)\n",
fdu, descyl, cyl, st0, NE7_ST0BITS);
fdu, descyl, cyl, st0);
return(retrier(fdcu));
}
}

View File

@ -41,7 +41,7 @@
*/
/* $Id: scd.c,v 1.2 1995/03/25 18:14:37 bde Exp $ */
/* $Id: scd.c,v 1.3 1995/04/12 20:48:02 wollman Exp $ */
/* Please send any comments to micke@dynas.se */
@ -327,7 +327,7 @@ scdstrategy(struct buf *bp)
XDEBUG(2, ("scd%d: DEBUG: strategy: block=%ld, bcount=%ld\n", unit, bp->b_blkno, bp->b_bcount));
if (unit >= NSCD || bp->b_blkno < 0 || (bp->b_bcount % SCDBLKSIZE)) {
printf("scd%d: strategy failure: blkno = %d, bcount = %d\n",
printf("scd%d: strategy failure: blkno = %ld, bcount = %ld\n",
unit, bp->b_blkno, bp->b_bcount);
bp->b_error = EINVAL;
bp->b_flags |= B_ERROR;
@ -428,7 +428,7 @@ scdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
part = scd_part(dev);
cd = scd_data + unit;
XDEBUG(1, ("scd%d: ioctl: cmd=0x%lx\n", unit, cmd));
XDEBUG(1, ("scd%d: ioctl: cmd=0x%x\n", unit, cmd));
if (!(cd->flags & SCDVALID))
return EIO;
@ -489,7 +489,7 @@ scdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
#endif
return 0;
default:
printf("scd%d: unsupported ioctl (cmd=0x%lx)\n", unit, cmd);
printf("scd%d: unsupported ioctl (cmd=0x%x)\n", unit, cmd);
return ENOTTY;
}
}
@ -1234,7 +1234,7 @@ read_toc(dev_t dev)
cd->blksize = SCDBLKSIZE;
cd->disksize = last*cd->blksize/DEV_BSIZE;
XDEBUG(1, ("scd%d: firstsector = %d, lastsector = %d", unit,
XDEBUG(1, ("scd%d: firstsector = %ld, lastsector = %ld", unit,
first, last));
cd->first_track = bcd2bin(toc.first_track);

View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.30 1995/03/28 07:55:23 bde Exp $
* $Id: aha1742.c,v 1.31 1995/04/12 20:47:34 wollman Exp $
*/
#include <sys/types.h>
@ -399,7 +399,7 @@ ahb_poll(int unit, int wait)
return (EIO);
}
if (cheat != ahb_ecb_phys_kv(ahb, inl(port + MBOXIN0))) {
printf("discarding %x ", inl(port + MBOXIN0));
printf("discarding 0x%lx ", inl(port + MBOXIN0));
outb(port + G2CNTRL, G2CNTRL_CLEAR_EISA_INT);
DELAY(50000);
goto retry;
@ -619,12 +619,14 @@ ahbintr(unit)
ahb->immed_ecb = 0;
break;
case AHB_ASN: /* for target mode */
printf("ahb%d: Unexpected ASN interrupt(%x)\n",
printf("ahb%d: "
"Unexpected ASN interrupt(0x%lx)\n",
unit, mboxval);
ecb = 0;
break;
case AHB_HW_ERR:
printf("ahb%d: Hardware error interrupt(%x)\n",
printf("ahb%d: "
"Hardware error interrupt(0x%lx)\n",
unit, mboxval);
ecb = 0;
break;

View File

@ -14,7 +14,7 @@
*
* commenced: Sun Sep 27 18:14:01 PDT 1992
*
* $Id: aha1742.c,v 1.30 1995/03/28 07:55:23 bde Exp $
* $Id: aha1742.c,v 1.31 1995/04/12 20:47:34 wollman Exp $
*/
#include <sys/types.h>
@ -399,7 +399,7 @@ ahb_poll(int unit, int wait)
return (EIO);
}
if (cheat != ahb_ecb_phys_kv(ahb, inl(port + MBOXIN0))) {
printf("discarding %x ", inl(port + MBOXIN0));
printf("discarding 0x%lx ", inl(port + MBOXIN0));
outb(port + G2CNTRL, G2CNTRL_CLEAR_EISA_INT);
DELAY(50000);
goto retry;
@ -619,12 +619,14 @@ ahbintr(unit)
ahb->immed_ecb = 0;
break;
case AHB_ASN: /* for target mode */
printf("ahb%d: Unexpected ASN interrupt(%x)\n",
printf("ahb%d: "
"Unexpected ASN interrupt(0x%lx)\n",
unit, mboxval);
ecb = 0;
break;
case AHB_HW_ERR:
printf("ahb%d: Hardware error interrupt(%x)\n",
printf("ahb%d: "
"Hardware error interrupt(0x%lx)\n",
unit, mboxval);
ecb = 0;
break;

View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.58 1995/04/20 03:17:44 julian Exp $
* $Id: fd.c,v 1.59 1995/05/06 19:34:25 joerg Exp $
*
*/
@ -693,7 +693,7 @@ fdattach(struct isa_device *dev)
fd->fdc = fdc;
fd->fdsu = fdsu;
fd->options = 0;
printf("fd%d: ", fdsu, fdu);
printf("fd%d: ", fdu);
fd_registerdev(fdcu, fdu);
switch (fdt) {
@ -1417,7 +1417,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
{
printf(
"fd%d: Seek to cyl %d failed; am at cyl %d (ST0 = 0x%x)\n",
fdu, descyl, cyl, st0, NE7_ST0BITS);
fdu, descyl, cyl, st0);
return(retrier(fdcu));
}
}

View File

@ -21,7 +21,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: if_le.c,v 1.14 1995/04/12 20:47:51 wollman Exp $
* $Id: if_le.c,v 1.15 1995/04/17 05:52:17 bde Exp $
*/
/*
@ -925,7 +925,7 @@ lemac_reset(
*/
if ((cksum = lemac_read_eeprom(sc)) != LEMAC_EEP_CKSUM) {
printf("%s%d: reset: EEPROM checksum failed (0x%x)\n",
sc->le_if.if_unit, sc->le_if.if_unit, cksum);
sc->le_if.if_name, sc->le_if.if_unit, cksum);
return;
}

View File

@ -41,7 +41,7 @@
*/
/* $Id: scd.c,v 1.2 1995/03/25 18:14:37 bde Exp $ */
/* $Id: scd.c,v 1.3 1995/04/12 20:48:02 wollman Exp $ */
/* Please send any comments to micke@dynas.se */
@ -327,7 +327,7 @@ scdstrategy(struct buf *bp)
XDEBUG(2, ("scd%d: DEBUG: strategy: block=%ld, bcount=%ld\n", unit, bp->b_blkno, bp->b_bcount));
if (unit >= NSCD || bp->b_blkno < 0 || (bp->b_bcount % SCDBLKSIZE)) {
printf("scd%d: strategy failure: blkno = %d, bcount = %d\n",
printf("scd%d: strategy failure: blkno = %ld, bcount = %ld\n",
unit, bp->b_blkno, bp->b_bcount);
bp->b_error = EINVAL;
bp->b_flags |= B_ERROR;
@ -428,7 +428,7 @@ scdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
part = scd_part(dev);
cd = scd_data + unit;
XDEBUG(1, ("scd%d: ioctl: cmd=0x%lx\n", unit, cmd));
XDEBUG(1, ("scd%d: ioctl: cmd=0x%x\n", unit, cmd));
if (!(cd->flags & SCDVALID))
return EIO;
@ -489,7 +489,7 @@ scdioctl(dev_t dev, int cmd, caddr_t addr, int flags)
#endif
return 0;
default:
printf("scd%d: unsupported ioctl (cmd=0x%lx)\n", unit, cmd);
printf("scd%d: unsupported ioctl (cmd=0x%x)\n", unit, cmd);
return ENOTTY;
}
}
@ -1234,7 +1234,7 @@ read_toc(dev_t dev)
cd->blksize = SCDBLKSIZE;
cd->disksize = last*cd->blksize/DEV_BSIZE;
XDEBUG(1, ("scd%d: firstsector = %d, lastsector = %d", unit,
XDEBUG(1, ("scd%d: firstsector = %ld, lastsector = %ld", unit,
first, last));
cd->first_track = bcd2bin(toc.first_track);

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
* $Id: wd.c,v 1.78 1995/04/30 15:14:16 bde Exp $
* $Id: wd.c,v 1.79 1995/05/08 16:48:23 bde Exp $
*/
/* TODO:
@ -1297,7 +1297,7 @@ wdsetctlr(struct disk *du)
/* obtain parameters */
wp = &du->dk_params;
if (wp->wdp_heads > 0 && wp->wdp_heads <= 16) {
printf("(controller value %lu restored)\n",
printf("(controller value %u restored)\n",
wp->wdp_heads);
du->dk_dd.d_ntracks = wp->wdp_heads;
}

View File

@ -43,7 +43,7 @@
* SUCH DAMAGE.
*
* from: @(#)fd.c 7.4 (Berkeley) 5/25/91
* $Id: fd.c,v 1.58 1995/04/20 03:17:44 julian Exp $
* $Id: fd.c,v 1.59 1995/05/06 19:34:25 joerg Exp $
*
*/
@ -693,7 +693,7 @@ fdattach(struct isa_device *dev)
fd->fdc = fdc;
fd->fdsu = fdsu;
fd->options = 0;
printf("fd%d: ", fdsu, fdu);
printf("fd%d: ", fdu);
fd_registerdev(fdcu, fdu);
switch (fdt) {
@ -1417,7 +1417,7 @@ fdstate(fdcu_t fdcu, fdc_p fdc)
{
printf(
"fd%d: Seek to cyl %d failed; am at cyl %d (ST0 = 0x%x)\n",
fdu, descyl, cyl, st0, NE7_ST0BITS);
fdu, descyl, cyl, st0);
return(retrier(fdcu));
}
}