Fix various format string types to as a minimum match the width of the

variables being processed.
ok bluhm@ henning@

5 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/pci/if_san_xilinx.c b/sys/dev/pci/if_san_xilinx.c
index dd90a0598b3..317e78f9f9f 100644
--- a/sys/dev/pci/if_san_xilinx.c
+++ b/sys/dev/pci/if_san_xilinx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_san_xilinx.c,v 1.25 2011/07/07 19:09:10 henning Exp $	*/
+/*	$OpenBSD: if_san_xilinx.c,v 1.26 2011/09/18 11:17:57 miod Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -484,7 +484,7 @@ wan_xilinx_up(struct ifnet *ifp)
 	sc->dma_mtu = xilinx_valid_mtu(ifp->if_mtu+100);
 
 	if (!sc->dma_mtu) {
-		log(LOG_INFO, "%s:%s: Error invalid MTU %lu\n",
+		log(LOG_INFO, "%s:%s: Error invalid MTU %u\n",
 		    card->devname, sc->if_name, ifp->if_mtu);
 		return (EINVAL);
 	}
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 6fe8c34ac19..ddf8dfe5b1a 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_vlan.c,v 1.88 2011/08/20 06:21:32 mcbride Exp $	*/
+/*	$OpenBSD: if_vlan.c,v 1.89 2011/09/18 11:17:57 miod Exp $	*/
 
 /*
  * Copyright 1998 Massachusetts Institute of Technology
@@ -383,7 +383,7 @@ vlan_config(struct ifvlan *ifv, struct ifnet *p, u_int16_t tag)
 		 */
 		ifv->ifv_if.if_mtu = p->if_mtu - EVL_ENCAPLEN;
 #ifdef DIAGNOSTIC
-		printf("%s: initialized with non-standard mtu %lu (parent %s)\n",
+		printf("%s: initialized with non-standard mtu %u (parent %s)\n",
 		    ifv->ifv_if.if_xname, ifv->ifv_if.if_mtu,
 		    ifv->ifv_p->if_xname);
 #endif
diff --git a/sys/net/pf_lb.c b/sys/net/pf_lb.c
index cef02687a55..bd9e78f7745 100644
--- a/sys/net/pf_lb.c
+++ b/sys/net/pf_lb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_lb.c,v 1.17 2011/07/29 10:48:35 mcbride Exp $ */
+/*	$OpenBSD: pf_lb.c,v 1.18 2011/09/18 11:17:57 miod Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -560,7 +560,7 @@ pf_map_addr(sa_family_t af, struct pf_rule *r, struct pf_addr *saddr,
 		pf_print_host(naddr, 0, af);
 		if ((rpool->opts & PF_POOL_TYPEMASK) ==
 		    PF_POOL_LEASTSTATES)
-			addlog(" with state count %d", states);
+			addlog(" with state count %llu", states);
 		if (((rpool->addr.type == PF_ADDR_TABLE &&
 		    rpool->addr.p.tbl->pfrkt_refcntcost > 0) ||
 		    (rpool->addr.type == PF_ADDR_DYNIFTL &&
diff --git a/sys/net/pf_norm.c b/sys/net/pf_norm.c
index cf30c5b1048..79c823914d2 100644
--- a/sys/net/pf_norm.c
+++ b/sys/net/pf_norm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_norm.c,v 1.140 2011/07/18 21:03:10 mikeb Exp $ */
+/*	$OpenBSD: pf_norm.c,v 1.141 2011/09/18 11:17:57 miod Exp $ */
 
 /*
  * Copyright 2001 Niels Provos <provos@citi.umich.edu>
@@ -1228,15 +1228,15 @@ pf_normalize_tcp_stateful(struct mbuf *m, int off, struct pf_pdesc *pd,
 			    SEQ_GT(tsecr, dst->scrub->pfss_tsval) ? '2' : ' ',
 			    SEQ_LT(tsecr, dst->scrub->pfss_tsval0)? '3' : ' ');
 			DPFPRINTF(LOG_NOTICE,
-			    " tsval: %lu  tsecr: %lu  +ticks: %lu  "
+			    " tsval: %u  tsecr: %u  +ticks: %u  "
 			    "idle: %lus %lums",
 			    tsval, tsecr, tsval_from_last, delta_ts.tv_sec,
 			    delta_ts.tv_usec / 1000);
 			DPFPRINTF(LOG_NOTICE,
-			    " src->tsval: %lu  tsecr: %lu",
+			    " src->tsval: %u  tsecr: %u",
 			    src->scrub->pfss_tsval, src->scrub->pfss_tsecr);
 			DPFPRINTF(LOG_NOTICE,
-			    " dst->tsval: %lu  tsecr: %lu  tsval0: %lu",
+			    " dst->tsval: %u  tsecr: %u  tsval0: %u",
 			    dst->scrub->pfss_tsval, dst->scrub->pfss_tsecr,
 			    dst->scrub->pfss_tsval0);
 			if (pf_status.debug >= LOG_NOTICE) {
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 0991cb507ca..c9f459f24b2 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ether.c,v 1.92 2011/07/06 02:42:28 henning Exp $	*/
+/*	$OpenBSD: if_ether.c,v 1.93 2011/09/18 11:17:58 miod Exp $	*/
 /*	$NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $	*/
 
 /*
@@ -1087,7 +1087,7 @@ db_show_radix_node(struct radix_node *rn, void *w, u_int id)
 
 	db_printf("rtentry=%p", rt);
 
-	db_printf(" flags=0x%x refcnt=%d use=%ld expire=%ld rtableid %u\n",
+	db_printf(" flags=0x%x refcnt=%d use=%llu expire=%u rtableid %u\n",
 	    rt->rt_flags, rt->rt_refcnt, rt->rt_use, rt->rt_expire, id);
 
 	db_printf(" key="); db_print_sa(rt_key(rt));