From: Sascha Wildner Date: Sat, 30 Apr 2011 20:57:06 +0000 (+0200) Subject: kernel: Fix some printf format warnings on x86_64. X-Git-Tag: v2.12.0~705 X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/664f5072cef79748e6724d889b7d37b9cd135fe6 kernel: Fix some printf format warnings on x86_64. --- diff --git a/sys/dev/crypto/ubsec/ubsec.c b/sys/dev/crypto/ubsec/ubsec.c index 73f2c285de..65a44730dc 100644 --- a/sys/dev/crypto/ubsec/ubsec.c +++ b/sys/dev/crypto/ubsec/ubsec.c @@ -1,5 +1,4 @@ /* $FreeBSD: src/sys/dev/ubsec/ubsec.c,v 1.6.2.12 2003/06/04 17:56:59 sam Exp $ */ -/* $DragonFly: src/sys/dev/crypto/ubsec/ubsec.c,v 1.13 2006/12/22 23:26:15 swildner Exp $ */ /* $OpenBSD: ubsec.c,v 1.115 2002/09/24 18:33:26 jason Exp $ */ /* @@ -2738,12 +2737,12 @@ ubsec_kprocess_rsapriv(struct ubsec_softc *sc, struct cryptkop *krp, int hint) #ifdef DIAGNOSTIC if (rp->rpr_msgin.dma_paddr & 3 || rp->rpr_msgin.dma_size & 3) { - panic("%s: rsapriv: invalid msgin %x(0x%x)", + panic("%s: rsapriv: invalid msgin %x(0x%lx)", device_get_nameunit(sc->sc_dev), rp->rpr_msgin.dma_paddr, rp->rpr_msgin.dma_size); } if (rp->rpr_msgout.dma_paddr & 3 || rp->rpr_msgout.dma_size & 3) { - panic("%s: rsapriv: invalid msgout %x(0x%x)", + panic("%s: rsapriv: invalid msgout %x(0x%lx)", device_get_nameunit(sc->sc_dev), rp->rpr_msgout.dma_paddr, rp->rpr_msgout.dma_size); } diff --git a/sys/dev/disk/fd/fd.c b/sys/dev/disk/fd/fd.c index 7caa248210..1cf4552669 100644 --- a/sys/dev/disk/fd/fd.c +++ b/sys/dev/disk/fd/fd.c @@ -79,6 +79,7 @@ #include #include +#include #include #include @@ -1475,7 +1476,7 @@ fdstrategy(struct dev_strategy_args *ap) if (bp->b_cmd != BUF_CMD_FORMAT) { if (bio->bio_offset < 0) { kprintf( - "fd%d: fdstrat: bad request offset = %lld, bcount = %d\n", + "fd%d: fdstrat: bad request offset = %"PRId64", bcount = %d\n", fdu, bio->bio_offset, bp->b_bcount); bp->b_error = EINVAL; bp->b_flags |= B_ERROR; diff --git a/sys/dev/misc/lpt/lpt.c b/sys/dev/misc/lpt/lpt.c index 8ce0ef27a3..89eb445944 100644 --- a/sys/dev/misc/lpt/lpt.c +++ b/sys/dev/misc/lpt/lpt.c @@ -77,6 +77,7 @@ #include #include +#include #include "lptio.h" #include @@ -393,7 +394,7 @@ lpt_attach(device_t dev) sc->sc_irq = 0; device_printf(dev, "Polled port\n"); } - lprintf(("irq %x %x\n", irq, sc->sc_irq)); + lprintf(("irq %"PRIxPTR" %x\n", irq, sc->sc_irq)); lpt_release_ppbus(dev); diff --git a/sys/dev/netif/bce/if_bce.c b/sys/dev/netif/bce/if_bce.c index 81936293a7..2282bbf671 100644 --- a/sys/dev/netif/bce/if_bce.c +++ b/sys/dev/netif/bce/if_bce.c @@ -28,7 +28,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/dev/bce/if_bce.c,v 1.31 2007/05/16 23:34:11 davidch Exp $ - * $DragonFly: src/sys/dev/netif/bce/if_bce.c,v 1.21 2008/11/19 13:57:49 sephe Exp $ */ /* @@ -4447,7 +4446,7 @@ bce_start(struct ifnet *ifp) return; DBPRINT(sc, BCE_INFO_SEND, - "%s(): Start: tx_prod = 0x%04X, tx_chain_prod = %04X, " + "%s(): Start: tx_prod = 0x%04X, tx_chain_prod = %04zX, " "tx_prod_bseq = 0x%08X\n", __func__, sc->tx_prod, TX_CHAIN_IDX(sc->tx_prod), sc->tx_prod_bseq); @@ -4499,7 +4498,7 @@ bce_start(struct ifnet *ifp) } DBPRINT(sc, BCE_INFO_SEND, - "%s(): End: tx_prod = 0x%04X, tx_chain_prod = 0x%04X, " + "%s(): End: tx_prod = 0x%04X, tx_chain_prod = 0x%04zX, " "tx_prod_bseq = 0x%08X\n", __func__, sc->tx_prod, TX_CHAIN_IDX(sc->tx_prod), sc->tx_prod_bseq); diff --git a/sys/dev/netif/ie/if_ie.c b/sys/dev/netif/ie/if_ie.c index c963df1b6c..00bf1a34f5 100644 --- a/sys/dev/netif/ie/if_ie.c +++ b/sys/dev/netif/ie/if_ie.c @@ -48,7 +48,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/dev/ie/if_ie.c,v 1.72.2.4 2003/03/27 21:01:49 mdodd Exp $ - * $DragonFly: src/sys/dev/netif/ie/if_ie.c,v 1.34 2008/08/02 01:14:42 dillon Exp $ */ /* @@ -133,6 +132,7 @@ iomem and and with 0xffff. #include #include +#include #include #include @@ -456,7 +456,7 @@ el_probe(struct isa_device *dvp) c = (inb(PORT + IE507_MADDR) & 0x1c) + 0xc0; if (kvtop(dvp->id_maddr) != ((int) c << 12)) { - kprintf("ie%d: kernel configured maddr %llx " + kprintf("ie%d: kernel configured maddr %"PRIx64" " "doesn't match board configured maddr %x\n", unit, kvtop(dvp->id_maddr), (int) c << 12); return (0); @@ -645,7 +645,7 @@ ee16_probe(struct isa_device *dvp) } dvp->id_msize = 0x8000; if (kvtop(dvp->id_maddr) != bd_maddr) { - kprintf("ie%d: kernel configured maddr %llx " + kprintf("ie%d: kernel configured maddr %"PRIx64" " "doesn't match board configured maddr %lx\n", unit, kvtop(dvp->id_maddr), bd_maddr); } diff --git a/sys/dev/netif/mn/if_mn.c b/sys/dev/netif/mn/if_mn.c index f7be0f33cc..5dbe728094 100644 --- a/sys/dev/netif/mn/if_mn.c +++ b/sys/dev/netif/mn/if_mn.c @@ -22,7 +22,6 @@ * this gadget. * * $FreeBSD: src/sys/pci/if_mn.c,v 1.11.2.3 2001/01/23 12:47:09 phk Exp $ - * $DragonFly: src/sys/dev/netif/mn/if_mn.c,v 1.18 2008/08/17 04:32:33 sephe Exp $ */ /* @@ -1274,15 +1273,15 @@ mn_probe (device_t self) u_int id = pci_get_devid(self); if (sizeof (struct m32xreg) != 256) { - kprintf("MN: sizeof(struct m32xreg) = %d, should have been 256\n", sizeof (struct m32xreg)); + kprintf("MN: sizeof(struct m32xreg) = %zd, should have been 256\n", sizeof (struct m32xreg)); return (ENXIO); } if (sizeof (struct f54rreg) != 128) { - kprintf("MN: sizeof(struct f54rreg) = %d, should have been 128\n", sizeof (struct f54rreg)); + kprintf("MN: sizeof(struct f54rreg) = %zd, should have been 128\n", sizeof (struct f54rreg)); return (ENXIO); } if (sizeof (struct f54wreg) != 128) { - kprintf("MN: sizeof(struct f54wreg) = %d, should have been 128\n", sizeof (struct f54wreg)); + kprintf("MN: sizeof(struct f54wreg) = %zd, should have been 128\n", sizeof (struct f54wreg)); return (ENXIO); } diff --git a/sys/kern/kern_checkpoint.c b/sys/kern/kern_checkpoint.c index 2f8fcfd3cf..4fe97c7bf4 100644 --- a/sys/kern/kern_checkpoint.c +++ b/sys/kern/kern_checkpoint.c @@ -22,8 +22,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $DragonFly: src/sys/kern/kern_checkpoint.c,v 1.20 2008/09/17 21:44:18 dillon Exp $ */ #include @@ -57,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -98,12 +97,12 @@ read_check(struct file *fp, void *buf, size_t nbyte) size_t nread; int error; - PRINTF(("reading %d bytes\n", nbyte)); + PRINTF(("reading %zd bytes\n", nbyte)); error = fp_read(fp, buf, nbyte, &nread, 1, UIO_SYSSPACE); if (error) { PRINTF(("read failed - %d", error)); } else if (nread != nbyte) { - PRINTF(("wanted to read %d - read %d\n", nbyte, nread)); + PRINTF(("wanted to read %zd - read %zd\n", nbyte, nread)); error = EINVAL; } return error; @@ -119,13 +118,13 @@ elf_gethdr(struct file *fp, Elf_Ehdr *ehdr) goto done; if (!(ehdr->e_ehsize == sizeof(Elf_Ehdr))) { PRINTF(("wrong elf header size: %d\n" - "expected size : %d\n", + "expected size : %zd\n", ehdr->e_ehsize, sizeof(Elf_Ehdr))); return EINVAL; } if (!(ehdr->e_phentsize == sizeof(Elf_Phdr))) { PRINTF(("wrong program header size: %d\n" - "expected size : %d\n", + "expected size : %zd\n", ehdr->e_phentsize, sizeof(Elf_Phdr))); return EINVAL; } @@ -164,10 +163,10 @@ elf_getphdrs(struct file *fp, Elf_Phdr *phdr, size_t nbyte) PRINTF(("headers section:\n")); for (i = 0; i < nheaders; i++) { PRINTF(("entry type: %d\n", phdr[i].p_type)); - PRINTF(("file offset: %d\n", phdr[i].p_offset)); + PRINTF(("file offset: %ld\n", phdr[i].p_offset)); PRINTF(("virt address: %p\n", (uint32_t *)phdr[i].p_vaddr)); - PRINTF(("file size: %d\n", phdr[i].p_filesz)); - PRINTF(("memory size: %d\n", phdr[i].p_memsz)); + PRINTF(("file size: %ld\n", phdr[i].p_filesz)); + PRINTF(("memory size: %ld\n", phdr[i].p_memsz)); PRINTF(("\n")); } done: @@ -327,7 +326,7 @@ elf_getnote(void *src, size_t *off, const char *name, unsigned int type, } bcopy((char *)src + *off, ¬e, sizeof note); - PRINTF(("at offset: %d expected note of type: %d - got: %d\n", + PRINTF(("at offset: %zd expected note of type: %d - got: %d\n", *off, type, note.n_type)); *off += sizeof note; if (type != note.n_type) { @@ -423,8 +422,8 @@ mmap_phdr(struct file *fp, Elf_Phdr *phdr) if ((error = fp_mmap(addr, len, prot, flags, fp, pos, &addr)) != 0) { PRINTF(("mmap failed: %d\n", error); ); } - PRINTF(("map @%08x-%08x fileoff %08x-%08x\n", (int)addr, - (int)((char *)addr + len), (int)pos, (int)(pos + len))); + PRINTF(("map @%08"PRIxPTR"-%08"PRIxPTR" fileoff %08x-%08x\n", (uintptr_t)addr, + (uintptr_t)((char *)addr + len), (int)pos, (int)(pos + len))); TRACE_EXIT; return error; } diff --git a/sys/net/vlan/if_vlan_ether.c b/sys/net/vlan/if_vlan_ether.c index 1e82042005..ed97f439d0 100644 --- a/sys/net/vlan/if_vlan_ether.c +++ b/sys/net/vlan/if_vlan_ether.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/net/if_vlan.c,v 1.15.2.13 2003/02/14 22:25:58 fenner Exp $ - * $DragonFly: src/sys/net/vlan/if_vlan_ether.c,v 1.3 2008/05/16 13:19:12 sephe Exp $ */ #include @@ -112,7 +111,7 @@ vlan_start_dispatch(netmsg_t msg) evl->evl_encap_proto = htons(ETHERTYPE_VLAN); evl->evl_tag = htons(vlantag); #ifdef DEBUG - kprintf("vlan_start: %*D\n", sizeof *evl, + kprintf("vlan_start: %*D\n", (int)sizeof *evl, (unsigned char *)evl, ":"); #endif /* Hardware does not need to setup vlan tagging */ diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index e1d5c13bfe..f742669a46 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -1,5 +1,4 @@ /* $KAME: sctp_indata.c,v 1.35 2004/08/17 04:06:17 itojun Exp $ */ -/* $DragonFly: src/sys/netinet/sctp_indata.c,v 1.8 2008/06/05 18:06:32 swildner Exp $ */ /* * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc, @@ -444,9 +443,9 @@ sctp_deliver_data(struct sctp_tcb *stcb, struct sctp_association *asoc, to = (struct sockaddr *)sctp_recover_scope((struct sockaddr_in6 *)to, &lsa6); if (((struct sockaddr_in *)to)->sin_port == 0) { - kprintf("Huh a, port is %d not net:%x %d?\n", + kprintf("Huh a, port is %d not net:%p %d?\n", ((struct sockaddr_in *)to)->sin_port, - (u_int)chk->whoTo, + chk->whoTo, (int)(ntohs(stcb->rport))); ((struct sockaddr_in *)to)->sin_port = stcb->rport; } @@ -669,9 +668,9 @@ sctp_service_reassembly(struct sctp_tcb *stcb, struct sctp_association *asoc, in to = (struct sockaddr *)sctp_recover_scope((struct sockaddr_in6 *)to, &lsa6); if (((struct sockaddr_in *)to)->sin_port == 0) { - kprintf("Huh b, port is %d not net:%x %d?\n", + kprintf("Huh b, port is %d not net:%p %d?\n", ((struct sockaddr_in *)to)->sin_port, - (u_int)chk->whoTo, + chk->whoTo, (int)(ntohs(stcb->rport))); ((struct sockaddr_in *)to)->sin_port = stcb->rport; } @@ -1982,9 +1981,9 @@ sctp_process_a_data_chunk(struct sctp_tcb *stcb, struct sctp_association *asoc, to = (struct sockaddr *)sctp_recover_scope((struct sockaddr_in6 *)to, &lsa6); if (((struct sockaddr_in *)to)->sin_port == 0) { - kprintf("Huh c, port is %d not net:%x %d?\n", + kprintf("Huh c, port is %d not net:%p %d?\n", ((struct sockaddr_in *)to)->sin_port, - (u_int)net, + net, (int)(ntohs(stcb->rport))); ((struct sockaddr_in *)to)->sin_port = stcb->rport; } diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 5f7ee39ddc..5bb2aec3d9 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -1,5 +1,4 @@ /* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */ -/* $DragonFly: src/sys/netinet/sctp_input.c,v 1.13 2008/04/20 13:44:25 swildner Exp $ */ /* * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc, @@ -3878,8 +3877,8 @@ sctp_common_input_processing(struct mbuf **mm, int iphlen, int offset, #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_INPUT1) { - kprintf("Ok, Common input processing called, m:%x iphlen:%d offset:%d\n", - (u_int)m, iphlen, offset); + kprintf("Ok, Common input processing called, m:%p iphlen:%d offset:%d\n", + m, iphlen, offset); } #endif /* SCTP_DEBUG */ if (IS_SCTP_CONTROL(ch)) { @@ -4181,8 +4180,8 @@ sctp_input(struct mbuf **mp, int *offp, int proto) if (calc_check != check) { #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_INPUT1) { - kprintf("Bad CSUM on SCTP packet calc_check:%x check:%x m:%x mlen:%d iphlen:%d\n", - calc_check, check, (u_int)m, mlen, iphlen); + kprintf("Bad CSUM on SCTP packet calc_check:%x check:%x m:%p mlen:%d iphlen:%d\n", + calc_check, check, m, mlen, iphlen); } #endif diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index d09eb4b25d..5cd67956d0 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -1,5 +1,4 @@ /* $KAME: sctp_output.c,v 1.46 2005/03/06 16:04:17 itojun Exp $ */ -/* $DragonFly: src/sys/netinet/sctp_output.c,v 1.14 2008/04/20 13:44:25 swildner Exp $ */ /* * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc, @@ -1042,7 +1041,7 @@ sctp_choose_v4_boundall(struct sctp_inpcb *inp, loopscope, ipv4_scope, &sin_loop, &sin_local); #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) { - kprintf("Found ifn:%x %d preferred source addresses\n", (u_int)ifn, num_prefered); + kprintf("Found ifn:%p %d preferred source addresses\n", ifn, num_prefered); } #endif if (num_prefered == 0) { @@ -1760,7 +1759,7 @@ sctp_choose_v6_boundall(struct sctp_inpcb *inp, if (sin6) { #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) { - kprintf("Selected address %d ifn:%x for the route\n", cur_addr_num, (u_int)ifn); + kprintf("Selected address %d ifn:%p for the route\n", cur_addr_num, ifn); } #endif if (net) { @@ -1790,14 +1789,14 @@ sctp_choose_v6_boundall(struct sctp_inpcb *inp, inp->next_ifn_touse = TAILQ_FIRST(&ifnet); #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) { - kprintf("Start at first IFN:%x\n", (u_int)inp->next_ifn_touse); + kprintf("Start at first IFN:%p\n", inp->next_ifn_touse); } #endif } else { inp->next_ifn_touse = TAILQ_NEXT(inp->next_ifn_touse, if_list); #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) { - kprintf("Resume at IFN:%x\n", (u_int)inp->next_ifn_touse); + kprintf("Resume at IFN:%p\n", inp->next_ifn_touse); } #endif if (inp->next_ifn_touse == NULL) { @@ -1840,7 +1839,7 @@ sctp_choose_v6_boundall(struct sctp_inpcb *inp, num_eligible_addr = sctp_count_v6_num_eligible_boundall (ifn, stcb, non_asoc_addr_ok, loopscope, loc_scope); #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) { - kprintf("IFN:%x has %d eligible\n", (u_int)ifn, num_eligible_addr); + kprintf("IFN:%p has %d eligible\n", ifn, num_eligible_addr); } #endif if (num_eligible_addr == 0) { @@ -1866,9 +1865,9 @@ sctp_choose_v6_boundall(struct sctp_inpcb *inp, } #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT1) { - kprintf("Selected the %d'th address of ifn:%x\n", + kprintf("Selected the %d'th address of ifn:%p\n", cur_addr_num, - (u_int)ifn); + ifn); } #endif return (sin6); @@ -3005,8 +3004,7 @@ sctp_send_initiate(struct sctp_inpcb *inp, struct sctp_tcb *stcb) } #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_OUTPUT4) { - kprintf("Calling lowlevel output stcb:%x net:%x\n", - (u_int)stcb, (u_int)net); + kprintf("Calling lowlevel output stcb:%p net:%p\n", stcb, net); } #endif ret = sctp_lowlevel_chunk_output(inp, stcb, net, diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index b66a735b57..f7fc2fd321 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -1,5 +1,4 @@ /* $KAME: sctp_timer.c,v 1.28 2004/08/17 04:06:20 itojun Exp $ */ -/* $DragonFly: src/sys/netinet/sctp_timer.c,v 1.6 2006/12/22 23:57:52 swildner Exp $ */ /* * Copyright (C) 2002, 2003, 2004 Cisco Systems Inc, @@ -1505,8 +1504,8 @@ sctp_iterator_timer(struct sctp_iterator *it) } if ((it->inp->inp_starting_point_for_iterator != NULL) && (it->inp->inp_starting_point_for_iterator != it)) { - kprintf("Iterator collision, we must wait for other iterator at %x\n", - (u_int)it->inp); + kprintf("Iterator collision, we must wait for other iterator at %p\n", + it->inp); SCTP_INP_WUNLOCK(it->inp); goto start_timer_return; } diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 54ce337260..7e0a3b3471 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -1,5 +1,4 @@ /* $KAME: sctp_usrreq.c,v 1.47 2005/03/06 16:04:18 itojun Exp $ */ -/* $DragonFly: src/sys/netinet/sctp_usrreq.c,v 1.14 2008/04/20 13:44:25 swildner Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. @@ -2001,7 +2000,7 @@ sctp_optsget(struct socket *so, #endif /* SCTP_DEBUG */ if ((size_t)m->m_len < sizeof(sctp_assoc_t)) { #ifdef SCTP_DEBUG - kprintf("m->m_len:%d not %d\n", + kprintf("m->m_len:%d not %zd\n", m->m_len, sizeof(sctp_assoc_t)); #endif /* SCTP_DEBUG */ error = EINVAL; @@ -3727,8 +3726,8 @@ sctp_usr_recvd(netmsg_t msg) inp = (struct sctp_inpcb *)so->so_pcb; #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_USRREQ2) - kprintf("Read for so:%x inp:%x Flags:%x\n", - (u_int)so, (u_int)inp, (u_int)flags); + kprintf("Read for so:%p inp:%p Flags:%x\n", + so, inp, (u_int)flags); #endif if (inp == 0) { @@ -3778,8 +3777,8 @@ sctp_usr_recvd(netmsg_t msg) } #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_USRREQ2) - kprintf("remove from socket queue for inp:%x tcbret:%x\n", - (u_int)inp, (u_int)stcb); + kprintf("remove from socket queue for inp:%p tcbret:%p\n", + inp, stcb); #endif stcb->asoc.my_rwnd_control_len = sctp_sbspace_sub(stcb->asoc.my_rwnd_control_len, @@ -3826,8 +3825,8 @@ sctp_usr_recvd(netmsg_t msg) int sq_cnt=0; #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_USRREQ2) - kprintf("Something off, inp:%x so->so_rcv->ssb_mb is empty and sockq is not.. cleaning\n", - (u_int)inp); + kprintf("Something off, inp:%p so->so_rcv->ssb_mb is empty and sockq is not.. cleaning\n", + inp); #endif if (((inp->sctp_flags & SCTP_PCB_FLAGS_IN_TCPPOOL) == 0) && ((inp->sctp_flags & SCTP_PCB_FLAGS_CONNECTED) == 0)) { diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 6db6065d76..9481a2f02b 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -1,5 +1,4 @@ /* $KAME: sctp6_usrreq.c,v 1.35 2004/08/17 06:28:03 t-momose Exp $ */ -/* $DragonFly: src/sys/netinet6/sctp6_usrreq.c,v 1.10 2007/04/22 01:13:14 dillon Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc. @@ -272,8 +271,8 @@ sctp6_input(struct mbuf **mp, int *offp, int proto) if (calc_check != check) { #ifdef SCTP_DEBUG if (sctp_debug_on & SCTP_DEBUG_INPUT1) { - kprintf("Bad CSUM on SCTP packet calc_check:%x check:%x m:%x mlen:%d iphlen:%d\n", - calc_check, check, (u_int)m, + kprintf("Bad CSUM on SCTP packet calc_check:%x check:%x m:%p mlen:%d iphlen:%d\n", + calc_check, check, m, mlen, iphlen); } #endif diff --git a/sys/vfs/msdosfs/msdosfs_conv.c b/sys/vfs/msdosfs/msdosfs_conv.c index ad62cf3f95..3d35c983f6 100644 --- a/sys/vfs/msdosfs/msdosfs_conv.c +++ b/sys/vfs/msdosfs/msdosfs_conv.c @@ -1,5 +1,4 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_conv.c,v 1.29.2.1 2002/11/08 22:01:22 semenu Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_conv.c,v 1.7 2006/12/23 00:41:29 swildner Exp $ */ /* $NetBSD: msdosfs_conv.c,v 1.25 1997/11/17 15:36:40 ws Exp $ */ /*- @@ -998,7 +997,7 @@ winChkName(struct mbnambuf *nbp, const u_char *un, size_t unlen, int chksum, if (!mbnambuf_flush(nbp, d_name, &d_namlen) || d_namlen == 0) return -1; #ifdef MSDOSFS_DEBUG - kprintf("winChkName(): un=%s:%d,d_name=%s:%d\n", un, unlen, + kprintf("winChkName(): un=%s:%zd,d_name=%s:%d\n", un, unlen, d_name, d_namlen); #endif diff --git a/sys/vfs/msdosfs/msdosfs_vnops.c b/sys/vfs/msdosfs/msdosfs_vnops.c index f0c6aff468..0b67134b2f 100644 --- a/sys/vfs/msdosfs/msdosfs_vnops.c +++ b/sys/vfs/msdosfs/msdosfs_vnops.c @@ -1,5 +1,4 @@ /* $FreeBSD: src/sys/msdosfs/msdosfs_vnops.c,v 1.95.2.4 2003/06/13 15:05:47 trhodes Exp $ */ -/* $DragonFly: src/sys/vfs/msdosfs/msdosfs_vnops.c,v 1.54 2007/11/20 21:03:50 dillon Exp $ */ /* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */ /*- @@ -72,6 +71,8 @@ #include +#include + #include "bpb.h" #include "direntry.h" #include "denode.h" @@ -346,9 +347,9 @@ msdosfs_setattr(struct vop_setattr_args *ap) (vap->va_bytes != VNOVAL) || (vap->va_gen != VNOVAL)) { #ifdef MSDOSFS_DEBUG kprintf("msdosfs_setattr(): returning EINVAL\n"); - kprintf(" va_type %d, va_nlink %llx, va_fsid %x, va_fileid %llx\n", + kprintf(" va_type %u, va_nlink %"PRIx64", va_fsid %x, va_fileid %"PRIx64"\n", vap->va_type, vap->va_nlink, vap->va_fsid, vap->va_fileid); - kprintf(" va_blocksize %lx, va_rmajor %x, va_bytes %qx, va_gen %llx\n", + kprintf(" va_blocksize %lx, va_rmajor %x, va_bytes %"PRIx64", va_gen %"PRIx64"\n", vap->va_blocksize, vap->va_rmajor, vap->va_bytes, vap->va_gen); kprintf(" va_uid %x, va_gid %x\n", vap->va_uid, vap->va_gid);