diff options
| author | Ray Lai <ray@cvs.openbsd.org> | 2007-05-23 01:32:26 +0000 |
|---|---|---|
| committer | Ray Lai <ray@cvs.openbsd.org> | 2007-05-23 01:32:26 +0000 |
| commit | 353cef1f6eeaad251d9bf77378dc00387d19e3fb (patch) | |
| tree | 12120dc671d3a709abb43100dd7a13ec5c0685f9 | |
| parent | ae5cd5ede9b8a1308a5e04a995d4548a799b11d4 (diff) | |
%z in printf(9) is not the same as %z in printf(3). Change to %lu
and cast arg to ulong.
OK jsg@ and krw@.
| -rw-r--r-- | sys/dev/ic/isp.c | 7 | ||||
| -rw-r--r-- | sys/dev/usb/if_ubt.c | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/ic/isp.c b/sys/dev/ic/isp.c index 9aa32f59acd..c23d1089bd5 100644 --- a/sys/dev/ic/isp.c +++ b/sys/dev/ic/isp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isp.c,v 1.38 2007/04/10 17:47:55 miod Exp $ */ +/* $OpenBSD: isp.c,v 1.39 2007/05/23 01:32:25 ray Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -99,7 +99,7 @@ static const char topology[] = static const char swrej[] = "Fabric Nameserver rejected %s (Reason=0x%x Expl=0x%x) for Port ID 0x%x"; static const char finmsg[] = - "(%d.%d.%d): FIN dl%d resid %zu STS 0x%x SKEY %c XS_ERR=0x%x"; + "(%d.%d.%d): FIN dl%d resid %lu STS 0x%x SKEY %c XS_ERR=0x%x"; static const char sc0[] = "%s CHAN %d FTHRSH %d IID %d RESETD %d RETRYC %d RETRYD %d ASD 0x%x"; static const char sc1[] = @@ -3880,7 +3880,8 @@ again: skey = '.'; } isp_prt(isp, ISP_LOGALL, finmsg, XS_CHANNEL(xs), - XS_TGT(xs), XS_LUN(xs), XS_XFRLEN(xs), XS_RESID(xs), + XS_TGT(xs), XS_LUN(xs), XS_XFRLEN(xs), + (ulong)XS_RESID(xs), *XS_STSP(xs), skey, XS_ERR(xs)); } diff --git a/sys/dev/usb/if_ubt.c b/sys/dev/usb/if_ubt.c index 0f18970b367..d5b96d5debb 100644 --- a/sys/dev/usb/if_ubt.c +++ b/sys/dev/usb/if_ubt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ubt.c,v 1.9 2007/05/22 07:01:19 matthieu Exp $ */ +/* $OpenBSD: if_ubt.c,v 1.10 2007/05/23 01:32:25 ray Exp $ */ /* * ng_ubt.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ubt.c,v 1.9 2007/05/22 07:01:19 matthieu Exp $ + * $Id: if_ubt.c,v 1.10 2007/05/23 01:32:25 ray Exp $ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.20 2004/10/12 23:33:46 emax Exp $ */ @@ -769,9 +769,9 @@ ubt_request_start(struct ubt_softc * sc) if (m->m_pkthdr.len > UBT_CTRL_BUFFER_SIZE) panic( -"%s: %s - HCI command frame too big, size=%zd, len=%d\n", - __func__, USBDEVNAME(sc->sc_dev), UBT_CTRL_BUFFER_SIZE, - m->m_pkthdr.len); +"%s: %s - HCI command frame too big, size=%lu, len=%d\n", + __func__, USBDEVNAME(sc->sc_dev), + (ulong)UBT_CTRL_BUFFER_SIZE, m->m_pkthdr.len); m_copydata(m, 0, m->m_pkthdr.len, sc->sc_ctrl_buffer); |