diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-01 17:36:20 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2013-11-01 17:36:20 +0000 |
| commit | b8183a0dbd4877f3cb0a20e0e6125c02674f08d2 (patch) | |
| tree | d8807435b56011aa01dbd9ae817d091c18d254de /sys/scsi | |
| parent | 0b88d158f37a4188b2c37633639614eba0110aa5 (diff) | |
Sprinkle (long long) casts where %lld is being used to print daddr_t
variables. Some random whitespace/knf repairs encountered on the way.
ok miod@ on inspection, feedback & more suggestions from millert@
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 4 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 7 | ||||
| -rw-r--r-- | sys/scsi/st.c | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 1bbbec7274f..cecb73d9c11 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.212 2013/10/03 14:07:41 krw Exp $ */ +/* $OpenBSD: cd.c,v 1.213 2013/11/01 17:36:19 krw Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -458,7 +458,7 @@ cdstrategy(struct buf *bp) } SC_DEBUG(sc->sc_link, SDEV_DB2, ("cdstrategy: %ld bytes @ blk %lld\n", - bp->b_bcount, bp->b_blkno)); + bp->b_bcount, (long long)bp->b_blkno)); /* * If the device has been made invalid, error out * maybe the media changed, or no media loaded diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 61a87ce4dac..da02600c0ea 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.250 2013/10/03 14:07:42 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.251 2013/11/01 17:36:19 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -532,7 +532,7 @@ sdstrategy(struct buf *bp) } SC_DEBUG(sc->sc_link, SDEV_DB2, ("sdstrategy: %ld bytes @ blk %lld\n", - bp->b_bcount, bp->b_blkno)); + bp->b_bcount, (long long)bp->b_blkno)); /* * If the device has been made invalid, error out */ @@ -1325,7 +1325,8 @@ sddump(dev_t dev, daddr_t blkno, caddr_t va, size_t size) return (ENXIO); #else /* SD_DUMP_NOT_TRUSTED */ /* Let's just talk about this first... */ - printf("sd%d: dump addr 0x%x, blk %lld\n", unit, va, blkno); + printf("sd%d: dump addr 0x%x, blk %lld\n", unit, va, + (long long)blkno); delay(500 * 1000); /* half a second */ #endif /* SD_DUMP_NOT_TRUSTED */ diff --git a/sys/scsi/st.c b/sys/scsi/st.c index a9cea73c86c..cdf862cf270 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -1,4 +1,4 @@ -/* $OpenBSD: st.c,v 1.125 2013/10/03 14:07:42 krw Exp $ */ +/* $OpenBSD: st.c,v 1.126 2013/11/01 17:36:19 krw Exp $ */ /* $NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $ */ /* @@ -842,7 +842,7 @@ ststrategy(struct buf *bp) sc_link = st->sc_link; SC_DEBUG(sc_link, SDEV_DB2, ("ststrategy: %ld bytes @ blk %lld\n", - bp->b_bcount, bp->b_blkno)); + bp->b_bcount, (long long)bp->b_blkno)); /* * If it's a null transfer, return immediately. |