commit 5c6979834655fb7244e23b958582d51bb176ce9a
author David Lamparter <equinox@diac24.net> Thu Feb 16 04:47:56 2012 +0100
committer David Lamparter <equinox@opensourcerouting.org> Wed Feb 04 06:07:54 2015 +0100
tree 97877da11c0f370ac3e8cb2846e5cca08c07a861
parent eb383d931c2bb54b5b84a827503f62cbf1070ef5

pimd: fix format strings

 * pim_igmp.c,
 * pim_igmpv3.c,
 * pim_pim.c,
 * pim_tlv.c: use %zu / %zd for size_t/ssize_t
 * pim_iface.c,
 * pim_ifchannel.c,
 * pim_mroute.c,
 * pim_neighbor.c,
 * pim_oil.c,
 * pim_ssmpingd.c,
 * pim_upstream.c: %zu for size_t
 * pim_cmd.c: %zu + a few (long long) casts for int64_t
 * pim_hello.c: %td for ptrdiff_t

pimd/pim_pim.c

diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 9595d2d..156081c 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -132,7 +132,7 @@
   }
     
   if (len < sizeof(*ip_hdr)) {
-    zlog_warn("PIM packet size=%d shorter than minimum=%d",
+    zlog_warn("PIM packet size=%zu shorter than minimum=%zu",
 	      len, sizeof(*ip_hdr));
     return -1;
   }
@@ -145,7 +145,7 @@
   ip_hlen = ip_hdr->ip_hl << 2; /* ip_hl gives length in 4-byte words */
 
   if (PIM_DEBUG_PIM_PACKETS) {
-    zlog_debug("Recv IP packet from %s to %s on %s: size=%d ip_header_size=%d ip_proto=%d",
+    zlog_debug("Recv IP packet from %s to %s on %s: size=%zu ip_header_size=%zu ip_proto=%d",
 	       src_str, dst_str, ifp->name, len, ip_hlen, ip_hdr->ip_p);
   }
 
@@ -156,12 +156,12 @@
   }
 
   if (ip_hlen < PIM_IP_HEADER_MIN_LEN) {
-    zlog_warn("IP packet header size=%d shorter than minimum=%d",
+    zlog_warn("IP packet header size=%zu shorter than minimum=%d",
 	      ip_hlen, PIM_IP_HEADER_MIN_LEN);
     return -1;
   }
   if (ip_hlen > PIM_IP_HEADER_MAX_LEN) {
-    zlog_warn("IP packet header size=%d greater than maximum=%d",
+    zlog_warn("IP packet header size=%zu greater than maximum=%d",
 	      ip_hlen, PIM_IP_HEADER_MAX_LEN);
     return -1;
   }
@@ -480,7 +480,7 @@
 		e, safe_strerror(e));
     }
     else {
-      zlog_warn("%s: sendto() partial to %s on %s: fd=%d msg_size=%d: sent=%d",
+      zlog_warn("%s: sendto() partial to %s on %s: fd=%d msg_size=%d: sent=%zd",
 		__PRETTY_FUNCTION__,
 		dst_str, ifname, fd,
 		pim_msg_size, sent);