From 6a527b2fc167405d2efbdffbe1636f73935f1885 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 28 Jun 2018 20:57:36 -0400 Subject: [PATCH] bgpd: Fix some build issues from removing HAVE_CUMULUS Signed-off-by: Donald Sharp --- bgpd/bgp_evpn_vty.c | 6 ++++-- bgpd/bgp_route.c | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c index b3edfed5a4..729bd87ada 100644 --- a/bgpd/bgp_evpn_vty.c +++ b/bgpd/bgp_evpn_vty.c @@ -3256,10 +3256,11 @@ DEFUN(show_bgp_l2vpn_evpn_es, { int idx = 0; uint8_t uj = 0; - esi_t esi = {0}; + esi_t esi; json_object *json = NULL; struct bgp *bgp = NULL; + memset(&esi, 0, sizeof(esi)); uj = use_json(argc, argv); bgp = bgp_get_default(); @@ -3541,10 +3542,11 @@ DEFUN(show_bgp_l2vpn_evpn_route_esi, JSON_STR) { int uj = 0; - esi_t esi = {0}; + esi_t esi; struct bgp *bgp = NULL; json_object *json = NULL; + memset(&esi, 0, sizeof(esi)); bgp = bgp_get_default(); if (!bgp) return CMD_WARNING; diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index fcf983e31a..7057b62f2b 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -8010,10 +8010,9 @@ void route_vty_out_detail(struct vty *vty, struct bgp *bgp, struct prefix *p, if (binfo->extra && binfo->extra->damp_info) bgp_damp_info_vty(vty, binfo, json_path); -/* Remote Label */ + /* Remote Label */ if (binfo->extra && bgp_is_valid_label(&binfo->extra->label[0]) - && safi != SAFI_EVPN) - { + && safi != SAFI_EVPN) { mpls_label_t label = label_pton(&binfo->extra->label[0]); if (json_paths) -- 2.39.5