Module Name: src
Committed By: tsutsui
Date: Sat Sep 12 18:44:36 UTC 2009
Modified Files:
src/sys/dev/gpib: ct.c mt.c ppi.c
Log Message:
Fix warnings of printf(9) format.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/gpib/ct.c src/sys/dev/gpib/mt.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/gpib/ppi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/gpib/ct.c
diff -u src/sys/dev/gpib/ct.c:1.21 src/sys/dev/gpib/ct.c:1.22
--- src/sys/dev/gpib/ct.c:1.21 Tue May 12 14:21:58 2009
+++ src/sys/dev/gpib/ct.c Sat Sep 12 18:44:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ct.c,v 1.21 2009/05/12 14:21:58 cegger Exp $ */
+/* $NetBSD: ct.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -121,7 +121,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.21 2009/05/12 14:21:58 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ct.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -485,7 +485,8 @@
struct ct_softc *sc;
int s;
- DPRINTF(CDB_FOLLOW, ("cdstrategy(%p): dev %x, bn %x, bcount %lx, %c\n",
+ DPRINTF(CDB_FOLLOW, ("cdstrategy(%p): dev %" PRIx64 ", bn %" PRIx64
+ ", bcount %x, %c\n",
bp, bp->b_dev, bp->b_blkno, bp->b_bcount,
(bp->b_flags & B_READ) ? 'R' : 'W'));
@@ -641,7 +642,7 @@
* we really read and update b_resid.
*/
blks = sc->sc_stat.c_blk - sc->sc_blkno - 1;
- DPRINTF(CDB_FILES, ("cteof: bc %ld oblk %d nblk %d read %ld, resid %ld\n",
+ DPRINTF(CDB_FILES, ("cteof: bc %d oblk %d nblk %d read %ld, resid %ld\n",
bp->b_bcount, sc->sc_blkno, sc->sc_stat.c_blk,
blks, bp->b_bcount - CTKTOB(blks)));
if (blks == -1) { /* 9145 on EOF does not change sc_stat.c_blk */
Index: src/sys/dev/gpib/mt.c
diff -u src/sys/dev/gpib/mt.c:1.21 src/sys/dev/gpib/mt.c:1.22
--- src/sys/dev/gpib/mt.c:1.21 Mon May 18 20:41:57 2009
+++ src/sys/dev/gpib/mt.c Sat Sep 12 18:44:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mt.c,v 1.21 2009/05/18 20:41:57 ad Exp $ */
+/* $NetBSD: mt.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -114,7 +114,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.21 2009/05/18 20:41:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mt.c,v 1.22 2009/09/12 18:44:36 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -955,8 +955,9 @@
if (i == 0)
sc->sc_flags |= MTF_HITEOF;
bp->b_resid = bp->b_bcount - i;
- DPRINTF(MDB_ANY, ("%s intr: bcount %ld, resid %ld",
- device_xname(&sc->sc_dev), bp->b_bcount, bp->b_resid));
+ DPRINTF(MDB_ANY, ("%s intr: bcount %d, resid %d",
+ device_xname(&sc->sc_dev),
+ bp->b_bcount, bp->b_resid));
} else {
tprintf(sc->sc_ttyp,
"%s: record (%d) larger than wanted (%d)\n",
Index: src/sys/dev/gpib/ppi.c
diff -u src/sys/dev/gpib/ppi.c:1.18 src/sys/dev/gpib/ppi.c:1.19
--- src/sys/dev/gpib/ppi.c:1.18 Sat Sep 12 18:43:03 2009
+++ src/sys/dev/gpib/ppi.c Sat Sep 12 18:44:36 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ppi.c,v 1.18 2009/09/12 18:43:03 tsutsui Exp $ */
+/* $NetBSD: ppi.c,v 1.19 2009/09/12 18:44:36 tsutsui Exp $ */
/*-
* Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.18 2009/09/12 18:43:03 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppi.c,v 1.19 2009/09/12 18:44:36 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -184,7 +184,7 @@
if ((sc->sc_flags & PPIF_ALIVE) == 0)
return (ENXIO);
- DPRINTF(PDB_FOLLOW, ("ppiopen(%x, %x): flags %x\n",
+ DPRINTF(PDB_FOLLOW, ("ppiopen(%" PRIx64 ", %x): flags %x\n",
dev, flags, sc->sc_flags));
if (sc->sc_flags & PPIF_OPEN)
@@ -204,7 +204,7 @@
sc = device_lookup_private(&ppi_cd, UNIT(dev));
- DPRINTF(PDB_FOLLOW, ("ppiclose(%x, %x): flags %x\n",
+ DPRINTF(PDB_FOLLOW, ("ppiclose(%" PRIx64 ", %x): flags %x\n",
dev, flags, sc->sc_flags));
sc->sc_flags &= ~PPIF_OPEN;
@@ -259,7 +259,7 @@
ppiread(dev_t dev, struct uio *uio, int flags)
{
- DPRINTF(PDB_FOLLOW, ("ppiread(%x, %p)\n", dev, uio));
+ DPRINTF(PDB_FOLLOW, ("ppiread(%" PRIx64 ", %p)\n", dev, uio));
return (ppirw(dev, uio));
}
@@ -268,7 +268,7 @@
ppiwrite(dev_t dev, struct uio *uio, int flags)
{
- DPRINTF(PDB_FOLLOW, ("ppiwrite(%x, %p)\n", dev, uio));
+ DPRINTF(PDB_FOLLOW, ("ppiwrite(%" PRIx64 ", %p)\n", dev, uio));
return (ppirw(dev, uio));
}
@@ -289,7 +289,7 @@
address = sc->sc_address;
DPRINTF(PDB_FOLLOW|PDB_IO,
- ("ppirw(%x, %p, %c): burst %d, timo %d, resid %x\n",
+ ("ppirw(%" PRIx64 ", %p, %c): burst %d, timo %d, resid %x\n",
dev, uio, uio->uio_rw == UIO_READ ? 'R' : 'W',
sc->sc_burst, sc->sc_timo, uio->uio_resid));
