bgpd: Cleanup some compiler warnings

Cleanup some compiler warnings discovered by
omnios.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index f4a83d720b735982234e631a2adf88f94be0eea5..b0bdb247d53116f273f4c7974497cd8448c544ff 100644 (file)
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -700,16 +700,16 @@ bgp_show_dampening_parameters (struct vty *vty, afi_t afi, safi_t safi)
 
   if (CHECK_FLAG (bgp->af_flags[afi][safi], BGP_CONFIG_DAMPENING))
     {
-      vty_out (vty, "Half-life time: %ld min%s",
-                    damp->half_life / 60, VTY_NEWLINE);
+      vty_out (vty, "Half-life time: %lld min%s",
+              (long long )damp->half_life / 60, VTY_NEWLINE);
       vty_out (vty, "Reuse penalty: %d%s",
-                    damp->reuse_limit, VTY_NEWLINE);
+              damp->reuse_limit, VTY_NEWLINE);
       vty_out (vty, "Suppress penalty: %d%s",
-                    damp->suppress_value, VTY_NEWLINE);
-      vty_out (vty, "Max suppress time: %ld min%s",
-                    damp->max_suppress_time / 60, VTY_NEWLINE);
+              damp->suppress_value, VTY_NEWLINE);
+      vty_out (vty, "Max suppress time: %lld min%s",
+              (long long)damp->max_suppress_time / 60, VTY_NEWLINE);
       vty_out (vty, "Max supress penalty: %u%s",
-                    damp->ceiling, VTY_NEWLINE);
+              damp->ceiling, VTY_NEWLINE);
       vty_out (vty, "%s", VTY_NEWLINE);
     }
   else

diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 6d23af03e4c2aaa8df71e6db4763d83e2dafafb2..20e4dd831d19b47803e5d6d2fdf627a13398a65e 100644 (file)
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -7407,7 +7407,8 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
 
       /* BGP Version. */
       json_object_int_add(json_neigh, "bgpVersion", 4);
-      json_object_string_add(json_neigh, "remoteRouterId", inet_ntop (AF_INET, &p->remote_id, buf1, BUFSIZ));
+      json_object_string_add(json_neigh, "remoteRouterId",
+                            inet_ntop (AF_INET, &p->remote_id, buf1, sizeof(buf1)));
 
       /* Confederation */
       if (CHECK_FLAG (bgp->config, BGP_CONFIG_CONFEDERATION) && bgp_confederation_peers_check (bgp, p->as))
@@ -7474,7 +7475,8 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
 
       /* BGP Version. */
       vty_out (vty, "  BGP version 4");
-      vty_out (vty, ", remote router ID %s%s", inet_ntop (AF_INET, &p->remote_id, buf1, BUFSIZ),
+      vty_out (vty, ", remote router ID %s%s",
+              inet_ntop (AF_INET, &p->remote_id, buf1, sizeof(buf1)),
                VTY_NEWLINE);
 
       /* Confederation */
@@ -8276,9 +8278,12 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
     {
       if (use_json)
         {
-          json_object_string_add(json_neigh, "nexthop", inet_ntop (AF_INET, &p->nexthop.v4, buf1, BUFSIZ));
-          json_object_string_add(json_neigh, "nexthopGlobal", inet_ntop (AF_INET6, &p->nexthop.v6_global, buf1, BUFSIZ));
-          json_object_string_add(json_neigh, "nexthopLocal", inet_ntop (AF_INET6, &p->nexthop.v6_local, buf1, BUFSIZ));
+          json_object_string_add(json_neigh, "nexthop",
+                                inet_ntop (AF_INET, &p->nexthop.v4, buf1, sizeof(buf1)));
+          json_object_string_add(json_neigh, "nexthopGlobal",
+                                inet_ntop (AF_INET6, &p->nexthop.v6_global, buf1, sizeof(buf1)));
+          json_object_string_add(json_neigh, "nexthopLocal",
+                                inet_ntop (AF_INET6, &p->nexthop.v6_local, buf1, sizeof(buf1)));
           if (p->shared_network)
             json_object_string_add(json_neigh, "bgpConnection", "sharedNetwork");
           else
@@ -8287,13 +8292,13 @@ bgp_show_peer (struct vty *vty, struct peer *p, u_char use_json, json_object *js
       else
         {
           vty_out (vty, "Nexthop: %s%s",
-                  inet_ntop (AF_INET, &p->nexthop.v4, buf1, BUFSIZ),
+                  inet_ntop (AF_INET, &p->nexthop.v4, buf1, sizeof(buf1)),
                   VTY_NEWLINE);
           vty_out (vty, "Nexthop global: %s%s",
-                  inet_ntop (AF_INET6, &p->nexthop.v6_global, buf1, BUFSIZ),
+                  inet_ntop (AF_INET6, &p->nexthop.v6_global, buf1, sizeof(buf1)),
                   VTY_NEWLINE);
           vty_out (vty, "Nexthop local: %s%s",
-                  inet_ntop (AF_INET6, &p->nexthop.v6_local, buf1, BUFSIZ),
+                  inet_ntop (AF_INET6, &p->nexthop.v6_local, buf1, sizeof(buf1)),
                   VTY_NEWLINE);
           vty_out (vty, "BGP connection: %s%s",
                   p->shared_network ? "shared network" : "non shared network",

diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index 716a1fb537416c1af349c45ea0155e6784e4c770..f7873ce2ba867cad0a4097ef2fc22a3ed490b8ef 100644 (file)
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -113,7 +113,7 @@ rfapiDebugBacktrace (void)
 
   for (i = 0; i < size && i < RFAPI_DEBUG_BACKTRACE_NENTRIES; ++i)
     {
-      vnc_zlog_debug_verbose ("backtrace[%2lu]: %s", i, syms[i]);
+      vnc_zlog_debug_verbose ("backtrace[%2zu]: %s", i, syms[i]);
     }
 
   free (syms);