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_cmd.c

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 60e5a16..c37e961 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -1091,8 +1091,8 @@
 	  "RPF Cache Refresh Last:     %s%s",
 	  qpim_rpf_cache_refresh_delay_msec, VTY_NEWLINE,
 	  pim_time_timer_remain_msec(qpim_rpf_cache_refresher), VTY_NEWLINE,
-	  qpim_rpf_cache_refresh_requests, VTY_NEWLINE,
-	  qpim_rpf_cache_refresh_events, VTY_NEWLINE,
+	  (long long)qpim_rpf_cache_refresh_requests, VTY_NEWLINE,
+	  (long long)qpim_rpf_cache_refresh_events, VTY_NEWLINE,
 	  refresh_uptime, VTY_NEWLINE);
 }
 
@@ -2241,7 +2241,7 @@
 	    bind_addr_str,
 	    ntohs(bind_addr.sin_port),
 	    ss_uptime,
-	    ss->requests,
+	    (long long)ss->requests,
 	    VTY_NEWLINE);
   }
 }
@@ -3642,7 +3642,7 @@
 
       left = sizeof(buf) - ip_hlen - pim_msg_size;
       if (left < 1) {
-	vty_out(vty, "%% Overflow buf_size=%d buf_left=%d at hex array arg %d=%s octet %02x%s",
+	vty_out(vty, "%% Overflow buf_size=%zu buf_left=%d at hex array arg %d=%s octet %02x%s",
 		sizeof(buf), left, argi, str, octet, VTY_NEWLINE);
 	return CMD_WARNING;
       }
@@ -3653,7 +3653,7 @@
 
   ip_msg_len = ip_hlen + pim_msg_size;
 
-  vty_out(vty, "Receiving: buf_size=%d ip_msg_size=%d pim_msg_size=%d%s",
+  vty_out(vty, "Receiving: buf_size=%zu ip_msg_size=%d pim_msg_size=%d%s",
 	  sizeof(buf), ip_msg_len, pim_msg_size, VTY_NEWLINE);
 
   /* "receive" message */
@@ -3873,7 +3873,7 @@
 
   remain = buf_pastend - buf;
   if (remain < (int) sizeof(struct ip)) {
-    vty_out(vty, "No room for ip header: buf_size=%d < ip_header_size=%d%s",
+    vty_out(vty, "No room for ip header: buf_size=%d < ip_header_size=%zu%s",
 	    remain, sizeof(struct ip), VTY_NEWLINE);
     return CMD_WARNING;
   }
@@ -4195,7 +4195,7 @@
 
   result = pim_mroute_msg(-1, (char *) &msg, sizeof(msg));
   if (result) {
-    vty_out(vty, "pim_mroute_msg(len=%d) returned failure: %d%s",
+    vty_out(vty, "pim_mroute_msg(len=%zu) returned failure: %d%s",
 	    sizeof(msg), result, VTY_NEWLINE);
     return CMD_WARNING;
   }