Fix compiler warnings from incorrect format strings

Mostly from incorrect usage of z option. Need to use:
  printf(" size = %zd", x->size);

6 files changed, 10 insertions, 8 deletions

diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 26f62f5a..b27267c0 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -1548,9 +1548,9 @@ bgp_attr_parse (struct peer *peer, struct attr *attr, bgp_size_t size,
           && ((endp - startp) < (BGP_ATTR_MIN_LEN + 1)))
 	{
 	  zlog (peer->log, LOG_WARNING, 
-		"%s Extended length set, but just %u bytes of attr header",
+		"%s Extended length set, but just %tu bytes of attr header",
 		peer->host,
-		(unsigned long) (endp - STREAM_PNT (BGP_INPUT (peer))));
+		endp - STREAM_PNT (BGP_INPUT (peer)));
 
 	  bgp_notify_send (peer, 
 			   BGP_NOTIFY_UPDATE_ERR, 
diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 84d8191e..9ecfb16a 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -526,7 +526,7 @@ bgp_capability_parse (struct peer *peer, size_t length, u_char **error)
               if (caphdr.length < cap_minsizes[caphdr.code])
                 {
                   zlog_info ("%s %s Capability length error: got %u,"
-                             " expected at least %u",
+                             " expected at least %zu",
                              peer->host, 
                              LOOKUP (capcode_str, caphdr.code),
                              caphdr.length, cap_minsizes[caphdr.code]);
diff --git a/ospfd/ospf_api.c b/ospfd/ospf_api.c
index 179c97a7..b6c8bc90 100644
--- a/ospfd/ospf_api.c
+++ b/ospfd/ospf_api.c
@@ -220,7 +220,7 @@ msg_print (struct msg *msg)
 #else /* ORIGINAL_CODING */
   /* API message common header part. */
   zlog_debug
-    ("API-msg [%s]: type(%d),len(%d),seq(%lu),data(%p),size(%z)",
+    ("API-msg [%s]: type(%d),len(%d),seq(%lu),data(%p),size(%zd)",
      ospf_api_typename (msg->hdr.msgtype), msg->hdr.msgtype, 
      ntohs (msg->hdr.msglen), (unsigned long) ntohl (msg->hdr.msgseq),
      STREAM_DATA (msg->s), STREAM_SIZE (msg->s));
diff --git a/ospfd/ospf_lsa.c b/ospfd/ospf_lsa.c
index 0d205ee3..fccae82f 100644
--- a/ospfd/ospf_lsa.c
+++ b/ospfd/ospf_lsa.c
@@ -526,7 +526,7 @@ link_info_set (struct stream *s, struct in_addr id,
       
       if (ret == OSPF_MAX_LSA_SIZE)
         {
-          zlog_warn ("%s: Out of space in LSA stream, left %ld, size %z",
+          zlog_warn ("%s: Out of space in LSA stream, left %zd, size %zd",
                      __func__, STREAM_REMAIN (s), STREAM_SIZE (s));
           return 0;
         }
diff --git a/ospfd/ospf_zebra.c b/ospfd/ospf_zebra.c
index 5405a782..c627afb2 100644
--- a/ospfd/ospf_zebra.c
+++ b/ospfd/ospf_zebra.c
@@ -136,7 +136,7 @@ ospf_interface_delete (int command, struct zclient *zclient,
 
   if (IS_DEBUG_OSPF (zebra, ZEBRA_INTERFACE))
     zlog_debug
-      ("Zebra: interface delete %s index %d flags %ld metric %d mtu %d",
+      ("Zebra: interface delete %s index %d flags %#llx metric %d mtu %d",
        ifp->name, ifp->ifindex, (unsigned long long)ifp->flags,
        ifp->metric, ifp->mtu);
 
diff --git a/ripngd/ripng_interface.c b/ripngd/ripng_interface.c
index c25677e7..cad6240b 100644
--- a/ripngd/ripng_interface.c
+++ b/ripngd/ripng_interface.c
@@ -294,7 +294,8 @@ ripng_interface_add (int command, struct zclient *zclient, zebra_size_t length)
 
   if (IS_RIPNG_DEBUG_ZEBRA)
     zlog_debug ("RIPng interface add %s index %d flags %#llx metric %d mtu %d",
-	       ifp->name, ifp->ifindex, ifp->flags, ifp->metric, ifp->mtu6);
+		ifp->name, ifp->ifindex, (unsigned long long) ifp->flags,
+		ifp->metric, ifp->mtu6);
 
   /* Check is this interface is RIP enabled or not.*/
   ripng_enable_apply (ifp);
@@ -327,7 +328,8 @@ ripng_interface_delete (int command, struct zclient *zclient,
   }
 
   zlog_info("interface delete %s index %d flags %#llx metric %d mtu %d",
-            ifp->name, ifp->ifindex, ifp->flags, ifp->metric, ifp->mtu6);
+            ifp->name, ifp->ifindex, (unsigned long long) ifp->flags,
+	    ifp->metric, ifp->mtu6);
 
   /* To support pseudo interface do not free interface structure.  */
   /* if_delete(ifp); */