diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2023-08-05 00:45:10 +0300 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2023-08-05 00:45:10 +0300 |
| commit | 8c098c31db3f4d201b5eff119acb956002f80d3c (patch) | |
| tree | efa89ea26c6950a923ef7207edd3805ef5ef0673 | |
| parent | 3eb4d42e62bd47a3265f5b08ec372108ef1388d8 (diff) | |
vtysh: remove unused cmd_filter_type
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
| -rw-r--r-- | lib/command.c | 16 | ||||
| -rw-r--r-- | lib/command_match.h | 5 |
2 files changed, 6 insertions, 15 deletions
diff --git a/lib/command.c b/lib/command.c index 8025ab534f..affb551b45 100644 --- a/lib/command.c +++ b/lib/command.c @@ -903,8 +903,7 @@ enum node_type node_parent(enum node_type node) } /* Execute command by argument vline vector. */ -static int cmd_execute_command_real(vector vline, enum cmd_filter_type filter, - struct vty *vty, +static int cmd_execute_command_real(vector vline, struct vty *vty, const struct cmd_element **cmd, unsigned int up_level) { @@ -1041,8 +1040,7 @@ int cmd_execute_command(vector vline, struct vty *vty, vector_set_index(shifted_vline, index - 1, vector_lookup(vline, index)); - ret = cmd_execute_command_real(shifted_vline, FILTER_RELAXED, - vty, cmd, 0); + ret = cmd_execute_command_real(shifted_vline, vty, cmd, 0); vector_free(shifted_vline); vty->node = onode; @@ -1051,7 +1049,7 @@ int cmd_execute_command(vector vline, struct vty *vty, } saved_ret = ret = - cmd_execute_command_real(vline, FILTER_RELAXED, vty, cmd, 0); + cmd_execute_command_real(vline, vty, cmd, 0); if (vtysh) return saved_ret; @@ -1069,8 +1067,7 @@ int cmd_execute_command(vector vline, struct vty *vty, if (vty->xpath_index > 0 && !cnode->no_xpath) vty->xpath_index--; - ret = cmd_execute_command_real(vline, FILTER_RELAXED, - vty, cmd, 0); + ret = cmd_execute_command_real(vline, vty, cmd, 0); if (ret == CMD_SUCCESS || ret == CMD_WARNING || ret == CMD_ERR_AMBIGUOUS || ret == CMD_ERR_INCOMPLETE || ret == CMD_NOT_MY_INSTANCE @@ -1102,7 +1099,7 @@ int cmd_execute_command(vector vline, struct vty *vty, int cmd_execute_command_strict(vector vline, struct vty *vty, const struct cmd_element **cmd) { - return cmd_execute_command_real(vline, FILTER_STRICT, vty, cmd, 0); + return cmd_execute_command_real(vline, vty, cmd, 0); } /* @@ -1274,8 +1271,7 @@ int command_config_read_one_line(struct vty *vty, && ret != CMD_ERR_AMBIGUOUS && ret != CMD_ERR_INCOMPLETE && ret != CMD_NOT_MY_INSTANCE && ret != CMD_WARNING_CONFIG_FAILED && ret != CMD_NO_LEVEL_UP) - ret = cmd_execute_command_real(vline, FILTER_STRICT, vty, cmd, - ++up_level); + ret = cmd_execute_command_real(vline, vty, cmd, ++up_level); if (ret == CMD_NO_LEVEL_UP) ret = CMD_ERR_NO_MATCH; diff --git a/lib/command_match.h b/lib/command_match.h index db2a8535e0..3e7a549e1d 100644 --- a/lib/command_match.h +++ b/lib/command_match.h @@ -17,11 +17,6 @@ extern "C" { #endif -/* These definitions exist in command.c in the current engine but should be - * relocated here in the new engine - */ -enum cmd_filter_type { FILTER_RELAXED, FILTER_STRICT }; - /* matcher result value */ enum matcher_rv { MATCHER_NO_MATCH, |