diff options
author | David Lamparter <equinox@diac24.net> | 2018-09-14 17:35:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-14 17:35:58 +0200 |
commit | 2fa3198399df58b1b039f094ad03d7c1329a2a3d (patch) | |
tree | 8bfb9ce491addede73950d9320bb075df0969339 /bgpd/rfapi | |
parent | Merge pull request #3019 from pacovn/static_analysis__shadow_variables4 (diff) | |
parent | *: style for EC replacements (diff) | |
download | frr-2fa3198399df58b1b039f094ad03d7c1329a2a3d.tar.xz frr-2fa3198399df58b1b039f094ad03d7c1329a2a3d.zip |
Merge pull request #3023 from qlyoung/ultimate-warning-reference-cards-rename
warning reference cards rename
Diffstat (limited to 'bgpd/rfapi')
-rw-r--r-- | bgpd/rfapi/rfapi.c | 8 | ||||
-rw-r--r-- | bgpd/rfapi/rfapi_import.c | 7 | ||||
-rw-r--r-- | bgpd/rfapi/vnc_export_bgp.c | 40 | ||||
-rw-r--r-- | bgpd/rfapi/vnc_import_bgp.c | 16 | ||||
-rw-r--r-- | bgpd/rfapi/vnc_zebra.c | 14 |
5 files changed, 42 insertions, 43 deletions
diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c index 18c3c6385..16dcbd4ee 100644 --- a/bgpd/rfapi/rfapi.c +++ b/bgpd/rfapi/rfapi.c @@ -3942,8 +3942,8 @@ void *rfapi_rfp_init_group_config_ptr_vty(void *rfp_start_val, size); break; default: - flog_err(LIB_ERR_DEVELOPMENT, "%s: Unknown group type=%d", - __func__, type); + flog_err(EC_LIB_DEVELOPMENT, "%s: Unknown group type=%d", + __func__, type); /* should never happen */ assert("Unknown type" == NULL); break; @@ -4057,8 +4057,8 @@ void *rfapi_rfp_get_group_config_ptr_name( criteria, search_cb); break; default: - flog_err(LIB_ERR_DEVELOPMENT, "%s: Unknown group type=%d", - __func__, type); + flog_err(EC_LIB_DEVELOPMENT, "%s: Unknown group type=%d", + __func__, type); /* should never happen */ assert("Unknown type" == NULL); break; diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c index f014f16fc..398de6b3a 100644 --- a/bgpd/rfapi/rfapi_import.c +++ b/bgpd/rfapi/rfapi_import.c @@ -3033,7 +3033,7 @@ static void rfapiBgpInfoFilteredImportEncap( break; default: - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad afi %d", __func__, afi); return; } @@ -3492,7 +3492,7 @@ void rfapiBgpInfoFilteredImportVPN( break; default: - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad afi %d", __func__, afi); return; } @@ -3897,8 +3897,7 @@ rfapiBgpInfoFilteredImportFunction(safi_t safi) default: /* not expected */ - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad safi %d", __func__, - safi); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad safi %d", __func__, safi); return rfapiBgpInfoFilteredImportBadSafi; } } diff --git a/bgpd/rfapi/vnc_export_bgp.c b/bgpd/rfapi/vnc_export_bgp.c index 628917564..f830c3ed5 100644 --- a/bgpd/rfapi/vnc_export_bgp.c +++ b/bgpd/rfapi/vnc_export_bgp.c @@ -188,8 +188,8 @@ void vnc_direct_bgp_add_route_ce(struct bgp *bgp, struct agg_node *rn, if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, - "%s: can't get afi of route node", __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of route node", + __func__); return; } @@ -335,7 +335,7 @@ void vnc_direct_bgp_del_route_ce(struct bgp *bgp, struct agg_node *rn, struct prefix ce_nexthop; if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi", __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad afi", __func__); return; } @@ -700,8 +700,8 @@ void vnc_direct_bgp_add_prefix(struct bgp *bgp, afi_t afi = family2afi(rn->p.family); if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, - "%s: can't get afi of route node", __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of route node", + __func__); return; } @@ -810,8 +810,8 @@ void vnc_direct_bgp_del_prefix(struct bgp *bgp, afi_t afi = family2afi(rn->p.family); if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi route node", - __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi route node", + __func__); return; } @@ -926,8 +926,8 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd) afi_t afi = family2afi(rfd->vn_addr.addr_family); if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, - "%s: can't get afi of nve vn addr", __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of nve vn addr", + __func__); return; } @@ -979,8 +979,8 @@ void vnc_direct_bgp_add_nve(struct bgp *bgp, struct rfapi_descriptor *rfd) if (afi == AFI_IP || afi == AFI_IP6) { rt = import_table->imported_vpn[afi]; } else { - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", - __func__, afi); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad afi %d", + __func__, afi); return; } @@ -1073,8 +1073,8 @@ void vnc_direct_bgp_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd) afi_t afi = family2afi(rfd->vn_addr.addr_family); if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, - "%s: can't get afi of nve vn addr", __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of nve vn addr", + __func__); return; } @@ -1121,8 +1121,8 @@ void vnc_direct_bgp_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd) if (afi == AFI_IP || afi == AFI_IP6) { rt = import_table->imported_vpn[afi]; } else { - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", - __func__, afi); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad afi %d", + __func__, afi); return; } @@ -1298,7 +1298,7 @@ static void vnc_direct_bgp_add_group_afi(struct bgp *bgp, if (afi == AFI_IP || afi == AFI_IP6) { rt = import_table->imported_vpn[afi]; } else { - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad afi %d", __func__, afi); return; } @@ -1642,8 +1642,8 @@ void vnc_direct_bgp_rh_add_route(struct bgp *bgp, afi_t afi, struct attr *iattr; if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, - "%s: can't get afi of route node", __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of route node", + __func__); return; } @@ -1762,8 +1762,8 @@ void vnc_direct_bgp_rh_del_route(struct bgp *bgp, afi_t afi, struct vnc_export_info *eti; if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi route node", - __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi route node", + __func__); return; } diff --git a/bgpd/rfapi/vnc_import_bgp.c b/bgpd/rfapi/vnc_import_bgp.c index 74dc20a93..71a4485d3 100644 --- a/bgpd/rfapi/vnc_import_bgp.c +++ b/bgpd/rfapi/vnc_import_bgp.c @@ -603,8 +603,8 @@ static void vnc_import_bgp_add_route_mode_resolve_nve( */ if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", - __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of prefix", + __func__); return; } @@ -720,8 +720,8 @@ static void vnc_import_bgp_add_route_mode_plain(struct bgp *bgp, } if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", - __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of prefix", + __func__); return; } @@ -908,8 +908,8 @@ vnc_import_bgp_add_route_mode_nvegroup(struct bgp *bgp, struct prefix *prefix, assert(rfg); if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", - __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of prefix", + __func__); return; } @@ -2634,8 +2634,8 @@ void vnc_import_bgp_add_route(struct bgp *bgp, struct prefix *prefix, VNC_RHNCK(enter); if (!afi) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: can't get afi of prefix", - __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: can't get afi of prefix", + __func__); return; } diff --git a/bgpd/rfapi/vnc_zebra.c b/bgpd/rfapi/vnc_zebra.c index a93fb6073..1db175536 100644 --- a/bgpd/rfapi/vnc_zebra.c +++ b/bgpd/rfapi/vnc_zebra.c @@ -571,8 +571,8 @@ static void vnc_zebra_add_del_prefix(struct bgp *bgp, return; if (rn->p.family != AF_INET && rn->p.family != AF_INET6) { - flog_err(LIB_ERR_DEVELOPMENT, - "%s: invalid route node addr family", __func__); + flog_err(EC_LIB_DEVELOPMENT, + "%s: invalid route node addr family", __func__); return; } @@ -644,8 +644,8 @@ static void vnc_zebra_add_del_nve(struct bgp *bgp, struct rfapi_descriptor *rfd, return; if (afi != AFI_IP && afi != AFI_IP6) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: invalid vn addr family", - __func__); + flog_err(EC_LIB_DEVELOPMENT, "%s: invalid vn addr family", + __func__); return; } @@ -743,13 +743,13 @@ static void vnc_zebra_add_del_group_afi(struct bgp *bgp, if (afi == AFI_IP || afi == AFI_IP6) { rt = import_table->imported_vpn[afi]; } else { - flog_err(LIB_ERR_DEVELOPMENT, "%s: bad afi %d", __func__, afi); + flog_err(EC_LIB_DEVELOPMENT, "%s: bad afi %d", __func__, afi); return; } if (!family) { - flog_err(LIB_ERR_DEVELOPMENT, "%s: computed bad family: %d", - __func__, family); + flog_err(EC_LIB_DEVELOPMENT, "%s: computed bad family: %d", + __func__, family); return; } |