diff options
author | bde <bde@FreeBSD.org> | 1998-08-18 00:32:50 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-08-18 00:32:50 +0000 |
commit | 09bd4b96031eb28e1f510c7fd8cb02e65daee9a0 (patch) | |
tree | 06b5b642aeea9a9a24327add2f724aa180a02b2f /sys/scsi | |
parent | 744645c0346324449f43323c246d39ca4bef546c (diff) | |
download | FreeBSD-src-09bd4b96031eb28e1f510c7fd8cb02e65daee9a0.zip FreeBSD-src-09bd4b96031eb28e1f510c7fd8cb02e65daee9a0.tar.gz |
Fixed printf format errors.
Diffstat (limited to 'sys/scsi')
-rw-r--r-- | sys/scsi/pt.c | 4 | ||||
-rw-r--r-- | sys/scsi/scsi_driver.c | 8 | ||||
-rw-r--r-- | sys/scsi/scsi_ioctl.c | 4 | ||||
-rw-r--r-- | sys/scsi/scsiconf.c | 8 | ||||
-rw-r--r-- | sys/scsi/sctarg.c | 4 | ||||
-rw-r--r-- | sys/scsi/st.c | 16 | ||||
-rw-r--r-- | sys/scsi/worm.c | 8 |
7 files changed, 26 insertions, 26 deletions
diff --git a/sys/scsi/pt.c b/sys/scsi/pt.c index dfa8829..c2a2a18 100644 --- a/sys/scsi/pt.c +++ b/sys/scsi/pt.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: pt.c,v 1.28 1998/06/17 14:13:14 bde Exp $ + * $Id: pt.c,v 1.29 1998/07/04 22:30:24 julian Exp $ */ #include "opt_bounce.h" @@ -209,7 +209,7 @@ ptstart(unit, flags) bp, flags) == SUCCESSFULLY_QUEUED) { } else { - printf("pt%ld: oops not queued\n", unit); + printf("pt%lu: oops not queued\n", (u_long)unit); bp->b_flags |= B_ERROR; bp->b_error = EIO; biodone(bp); diff --git a/sys/scsi/scsi_driver.c b/sys/scsi/scsi_driver.c index d71d6b7..69f2278 100644 --- a/sys/scsi/scsi_driver.c +++ b/sys/scsi/scsi_driver.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scsi_driver.c,v 1.25 1997/09/02 04:37:57 bde Exp $ + * $Id: scsi_driver.c,v 1.26 1997/09/02 20:06:34 bde Exp $ * */ @@ -143,8 +143,8 @@ struct scsi_device *device) if (!errcode ) sc_link->flags |= SDEV_IS_OPEN; - SC_DEBUG(sc_link, SDEV_DB1, ("%sopen: dev=0x%lx (unit %ld) result %d\n", - device->name, dev, unit, errcode)); + SC_DEBUG(sc_link, SDEV_DB1, ("%sopen: dev=0x%lx (unit %lu) result %d\n", + device->name, (u_long)dev, (u_long)unit, errcode)); return errcode; } @@ -198,7 +198,7 @@ scsi_strategy(struct buf *bp, struct scsi_device *device) SC_DEBUG(sc_link, SDEV_DB2, ("\n%sstrategy ", device->name)); SC_DEBUG(sc_link, SDEV_DB1, ("%ld bytes @ blk%ld\n", - bp->b_bcount, bp->b_blkno)); + bp->b_bcount, (long)bp->b_blkno)); if (SCSI_CONTROL(bp->b_dev) || (device->dev_strategy == 0)) { diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index 4d5b94c..c63de3a 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. *End copyright * - * $Id: scsi_ioctl.c,v 1.30 1998/03/28 10:33:21 bde Exp $ + * $Id: scsi_ioctl.c,v 1.31 1998/06/07 17:12:49 dfr Exp $ * * */ @@ -260,7 +260,7 @@ struct proc *p, struct scsi_link *sc_link) if (cmd != SCIOCIDENTIFY && cmd != SCIOCGETDEVINFO&& !(flags & FWRITE)) return EACCES; - SC_DEBUG(sc_link,SDEV_DB2,("scsi_do_ioctl(0x%x)\n",cmd)); + SC_DEBUG(sc_link,SDEV_DB2, ("scsi_do_ioctl(0x%lx)\n", cmd)); switch(cmd) { case SCIOCCOMMAND: diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index 50a6a95..f805edc 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -16,7 +16,7 @@ * * New configuration setup: dufault@hda.com * - * $Id: scsiconf.c,v 1.106 1998/07/11 07:45:58 bde Exp $ + * $Id: scsiconf.c,v 1.107 1998/07/28 09:03:37 phk Exp $ */ #include "opt_scsi.h" @@ -1446,14 +1446,14 @@ scsi_probedev(sc_link, maybe_more, type_p) sc_print_start(sc_link); printf("<%s %s %s> ", manu, model, version ); - printf("type %ld %sSCSI %d" - ,type + printf("type %lu %sSCSI %d" + ,(u_long)type ,remov ? "removable " : "fixed " ,inqbuf->version & SID_ANSII ); if (qtype[0]) { sc_print_addr(sc_link); - printf(" qualifier %ld: %s" ,qualifier ,qtype); + printf(" qualifier %lu: %s", (u_long)qualifier, qtype); } printf("\n"); diff --git a/sys/scsi/sctarg.c b/sys/scsi/sctarg.c index f48792f..d2f8f6f 100644 --- a/sys/scsi/sctarg.c +++ b/sys/scsi/sctarg.c @@ -37,7 +37,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sctarg.c,v 1.26 1998/06/17 14:13:14 bde Exp $ + * $Id: sctarg.c,v 1.27 1998/07/04 22:30:24 julian Exp $ */ #include "opt_bounce.h" @@ -248,7 +248,7 @@ sctargstart(unit, unused_flags) bp, flags | SCSI_NOSLEEP) == SUCCESSFULLY_QUEUED) { } else { - printf("sctarg%ld: oops not queued\n", unit); + printf("sctarg%lu: oops not queued\n", (u_long)unit); bp->b_flags |= B_ERROR; bp->b_error = EIO; biodone(bp); diff --git a/sys/scsi/st.c b/sys/scsi/st.c index 21d1267..8bf2c35 100644 --- a/sys/scsi/st.c +++ b/sys/scsi/st.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: st.c,v 1.91 1998/07/11 07:46:01 bde Exp $ + * $Id: st.c,v 1.92 1998/07/31 09:00:39 phk Exp $ */ /* @@ -272,22 +272,22 @@ stattach(struct scsi_link *sc_link) devfs_add_devswf(&st_cdevsw, (unit << 4 ) + (ii * 4), DV_CHR, UID_ROOT, GID_OPERATOR, 0660, - "rst%ld.%d", unit, ii); + "rst%lu.%d", (u_long)unit, ii); st->devfs_token.nrst_[ii] = devfs_add_devswf(&st_cdevsw, (unit << 4 ) + ((ii * 4) + 1), DV_CHR, UID_ROOT, GID_OPERATOR, 0660, - "nrst%ld.%d", unit, ii); + "nrst%lu.%d", (u_long)unit, ii); st->devfs_token.erst_[ii] = devfs_add_devswf(&st_cdevsw, (unit << 4 ) + ((ii * 4) + 2), DV_CHR, UID_ROOT, GID_OPERATOR, 0660, - "erst%ld.%d", unit, ii); + "erst%lu.%d", (u_long)unit, ii); st->devfs_token.ctl_[ii] = devfs_add_devswf(&st_cdevsw, (unit << 4 ) + ((ii * 4) + 3), DV_CHR, UID_ROOT, GID_OPERATOR, 0600, - "st%ldctl.%d", unit, ii); + "st%luctl.%d", (u_long)unit, ii); } st->devfs_token.ctl = @@ -296,11 +296,11 @@ stattach(struct scsi_link *sc_link) "rst%d.ctl", unit); /** add links **/ st->devfs_token.rst = - devfs_link(st->devfs_token.rst_[0], "rst%ld", unit); + devfs_link(st->devfs_token.rst_[0], "rst%lu", (u_long)unit); st->devfs_token.nrst = - devfs_link(st->devfs_token.nrst_[0], "nrst%ld", unit); + devfs_link(st->devfs_token.nrst_[0], "nrst%lu", (u_long)unit); st->devfs_token.erst = - devfs_link(st->devfs_token.erst_[0], "erst%ld", unit); + devfs_link(st->devfs_token.erst_[0], "erst%lu", (u_long)unit); #endif return 0; } diff --git a/sys/scsi/worm.c b/sys/scsi/worm.c index 9310a8e..1601d8e 100644 --- a/sys/scsi/worm.c +++ b/sys/scsi/worm.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: worm.c,v 1.57 1998/06/17 14:13:15 bde Exp $ + * $Id: worm.c,v 1.58 1998/07/04 22:30:25 julian Exp $ */ #include "opt_bounce.h" @@ -276,7 +276,7 @@ wormattach(struct scsi_link *sc_link) struct scsi_data *worm = sc_link->sd; if (sc_link->devmodes == 0) - printf(", warning: unknown drive type", unit); + printf(", warning: unknown drive type"); bufq_init(&worm->buf_queue); @@ -444,7 +444,7 @@ wormstart(unit, flags) if ((bp->b_flags & B_READ) == B_WRITE) worm->worm_flags |= WORMFL_WRITTEN; } else { - printf("worm%ld: oops not queued\n", unit); + printf("worm%lu: oops not queued\n", (u_long)unit); if (bp) { bp->b_flags |= B_ERROR; bp->b_error = EIO; @@ -661,7 +661,7 @@ worm_ioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p, */ unit = wormunit(dev); worm = sc_link->sd; - SC_DEBUG(sc_link, SDEV_DB2, ("wormioctl 0x%x ", cmd)); + SC_DEBUG(sc_link, SDEV_DB2, ("wormioctl 0x%lx ", cmd)); switch (cmd) { case WORMIOCPREPDISK: |