bgpd: Fix warnings -> errors issues

Switched to !another! new compiler and a few more
warnings creeped in.  Also noticed a json issue
that caused an error in output.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Reviewed-by: Don Slice <dslice@cumulusnetworks.com>
Reviewed-by: Daniel Walton <dwalton@cumulusnetworks.com>

diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index c8176d43b525720261f42cd4a23a92db200e5e5d..31ec6947a1f6ccc2155421e5f03f741be9738611 100644 (file)
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -441,7 +441,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd, u
                     {
                       u_int16_t type;
                       struct rd_as rd_as;
-                      struct rd_ip rd_ip;
+                      struct rd_ip rd_ip = { 0, { 0 }, 0};
                       u_char *pnt;
 
                       pnt = rn->p.u.val;
@@ -460,7 +460,7 @@ show_adj_route_vpn (struct vty *vty, struct peer *peer, struct prefix_rd *prd, u
                           if (type == RD_TYPE_AS)
                             sprintf (buffer, "%u:%d", rd_as.as, rd_as.val);
                           else if (type == RD_TYPE_IP)
-                            sprintf (buffer, "%u:%d", rd_as.as, rd_as.val);
+                            sprintf (buffer, "%s:%d", inet_ntoa (rd_ip.ip), rd_ip.val);
                           json_object_string_add(json_routes, "routeDistinguisher", buffer);
                         }
                       else
@@ -622,7 +622,7 @@ bgp_show_mpls_vpn (struct vty *vty, struct prefix_rd *prd, enum bgp_show_type ty
                    {
                      u_int16_t type;
                      struct rd_as rd_as;
-                     struct rd_ip rd_ip;
+                     struct rd_ip rd_ip = { 0, { 0 }, 0};
                      u_char *pnt;
 
                      pnt = rn->p.u.val;