From 69337c345ed256aa2b8a8b49b903d07a178f2cae Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 14 Feb 2020 15:32:40 -0500 Subject: [PATCH] bgpd: Use the enum properly in a switch for rpki commands During route-map processing we return an enum, the rpki code was doing some extra gyrations that were unnecessary. Simplify. Signed-off-by: Donald Sharp --- bgpd/bgp_rpki.c | 50 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/bgpd/bgp_rpki.c b/bgpd/bgp_rpki.c index 7247210c93..2ca0c7b96d 100644 --- a/bgpd/bgp_rpki.c +++ b/bgpd/bgp_rpki.c @@ -1412,21 +1412,18 @@ DEFUN (match_rpki, ret = route_map_add_match(index, "rpki", argv[2]->arg, RMAP_EVENT_MATCH_ADDED); - if (ret) { - switch (ret) { - case RMAP_RULE_MISSING: - vty_out(vty, "%% BGP Can't find rule.\n"); - return CMD_WARNING_CONFIG_FAILED; - case RMAP_COMPILE_ERROR: - vty_out(vty, "%% BGP Argument is malformed.\n"); - return CMD_WARNING_CONFIG_FAILED; - case RMAP_COMPILE_SUCCESS: - /* - * Intentionally doing nothing here - */ - break; - } + switch (ret) { + case RMAP_RULE_MISSING: + vty_out(vty, "%% BGP Can't find rule.\n"); + return CMD_WARNING_CONFIG_FAILED; + case RMAP_COMPILE_ERROR: + vty_out(vty, "%% BGP Argument is malformed.\n"); + return CMD_WARNING_CONFIG_FAILED; + case RMAP_COMPILE_SUCCESS: + return CMD_SUCCESS; + break; } + return CMD_SUCCESS; } @@ -1445,21 +1442,18 @@ DEFUN (no_match_rpki, ret = route_map_delete_match(index, "rpki", argv[3]->arg, RMAP_EVENT_MATCH_DELETED); - if (ret) { - switch (ret) { - case RMAP_RULE_MISSING: - vty_out(vty, "%% BGP Can't find rule.\n"); - break; - case RMAP_COMPILE_ERROR: - vty_out(vty, "%% BGP Argument is malformed.\n"); - break; - case RMAP_COMPILE_SUCCESS: - /* - * Nothing to do here - */ - break; - } + switch (ret) { + case RMAP_RULE_MISSING: + vty_out(vty, "%% BGP Can't find rule.\n"); + return CMD_WARNING_CONFIG_FAILED; + break; + case RMAP_COMPILE_ERROR: + vty_out(vty, "%% BGP Argument is malformed.\n"); return CMD_WARNING_CONFIG_FAILED; + break; + case RMAP_COMPILE_SUCCESS: + return CMD_SUCCESS; + break; } return CMD_SUCCESS; -- 2.39.5