zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / grammar_sandbox.c

diff --git a/lib/grammar_sandbox.c b/lib/grammar_sandbox.c
index ef03e85217b4c10d703c2c1e67e7ff6cab5a87e5..20d5879c67784278225635c000c540bc00ccf3d7 100644 (file)
--- a/lib/grammar_sandbox.c
+++ b/lib/grammar_sandbox.c
@@ -140,7 +140,7 @@ DEFUN (grammar_test_complete,
                vty_out(vty, "%% No match\n");
 
        // free resources
-       list_delete_and_null(&completions);
+       list_delete(&completions);
        cmd_free_strvec(command);
        XFREE(MTYPE_TMP, cmdstr);
 
@@ -184,7 +184,7 @@ DEFUN (grammar_test_match,
 
                vty_out(vty, "func: %p\n", element->func);
 
-               list_delete_and_null(&argvv);
+               list_delete(&argvv);
        } else {
                assert(MATCHER_ERROR(result));
                switch (result) {
@@ -315,7 +315,7 @@ static void cmd_graph_permute(struct list *out, struct graph_node **stack,
        struct graph_node *gn = stack[stackpos];
        struct cmd_token *tok = gn->data;
        char *appendp = cmd + strlen(cmd);
-       size_t i, j;
+       size_t j;
 
        if (tok->type < SPECIAL_TKN) {
                sprintf(appendp, "%s ", tok->text);
@@ -332,7 +332,7 @@ static void cmd_graph_permute(struct list *out, struct graph_node **stack,
        if (++stackpos == CMD_ARGC_MAX)
                return;
 
-       for (i = 0; i < vector_active(gn->to); i++) {
+       for (size_t i = 0; i < vector_active(gn->to); i++) {
                struct graph_node *gnext = vector_slot(gn->to, i);
                for (j = 0; j < stackpos; j++)
                        if (stack[j] == gnext)
@@ -421,7 +421,7 @@ DEFUN (grammar_findambig,
                        }
                        prev = cur;
                }
-               list_delete_and_null(&commands);
+               list_delete(&commands);
 
                vty_out(vty, "\n");
        } while (scan && scannode < LINK_PARAMS_NODE);