proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 05:00:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: remove static variable from cli matcher

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2017-08-25 14:08:16 -04:00
parent 8295b504cb
commit 935cee3f9b
No known key found for this signature in database
GPG Key ID: DAF48E0F57E0834F
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/command_match.c
View File

@ -81,9 +81,6 @@ static enum match_type match_variable(struct cmd_token *, const char *);
static enum match_type match_mac(const char *, bool); static enum match_type match_mac(const char *, bool);
/* matching functions */
static enum matcher_rv matcher_rv;
enum matcher_rv command_match(struct graph *cmdgraph, vector vline, enum matcher_rv command_match(struct graph *cmdgraph, vector vline,
struct list **argv, const struct cmd_element **el) struct list **argv, const struct cmd_element **el)
{ {
@ -446,12 +443,12 @@ enum matcher_rv command_complete(struct graph *graph, vector vline,
* next = set of all nodes reachable from all nodes in `matched` * next = set of all nodes reachable from all nodes in `matched`
*/ */
matcher_rv = idx == vector_active(vline) && next->count enum matcher_rv mrv = idx == vector_active(vline) && next->count
? MATCHER_OK ? MATCHER_OK
: MATCHER_NO_MATCH; : MATCHER_NO_MATCH;
*completions = NULL; *completions = NULL;
if (!MATCHER_ERROR(matcher_rv)) { if (!MATCHER_ERROR(mrv)) {
// extract cmd_token into list // extract cmd_token into list
*completions = list_new(); *completions = list_new();
for (ALL_LIST_ELEMENTS_RO(next, node, gstack)) { for (ALL_LIST_ELEMENTS_RO(next, node, gstack)) {
@ -462,7 +459,7 @@ enum matcher_rv command_complete(struct graph *graph, vector vline,
list_delete(current); list_delete(current);
list_delete(next); list_delete(next);
return matcher_rv; return mrv;
} }
/** /**