diff options
Diffstat (limited to 'src/vppinfra/macros.c')
-rw-r--r-- | src/vppinfra/macros.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/vppinfra/macros.c b/src/vppinfra/macros.c index b8a8e1744aa..b8644b2738e 100644 --- a/src/vppinfra/macros.c +++ b/src/vppinfra/macros.c @@ -175,7 +175,7 @@ clib_macro_eval (clib_macro_main_t * mm, i8 * s, i32 complain, u16 level, /* add results to answer */ vec_append (rv, ts); /* Remove NULL termination or the results are sad */ - _vec_len (rv) = vec_len (rv) - 1; + vec_set_len (rv, vec_len (rv) - 1); vec_free (ts); } else @@ -183,8 +183,7 @@ clib_macro_eval (clib_macro_main_t * mm, i8 * s, i32 complain, u16 level, if (complain) clib_warning ("Undefined Variable Reference: %s\n", varname); vec_append (rv, format (0, "UNSET ")); - _vec_len (rv) = vec_len (rv) - 1; - + vec_set_len (rv, vec_len (rv) - 1); } vec_free (varname); } @@ -252,13 +251,11 @@ clib_macro_free (clib_macro_main_t * mm) hash_free (mm->the_builtin_eval_hash); - /* *INDENT-OFF* */ hash_foreach_pair (p, mm->the_value_table_hash, ({ vec_add1 (strings_to_free, (u8 *) (p->key)); vec_add1 (strings_to_free, (u8 *) (p->value[0])); })); - /* *INDENT-ON* */ for (i = 0; i < vec_len (strings_to_free); i++) vec_free (strings_to_free[i]); @@ -291,14 +288,12 @@ format_clib_macro_main (u8 * s, va_list * args) name_sort_t *nses = 0, *ns; int i; - /* *INDENT-OFF* */ hash_foreach_pair (p, mm->the_value_table_hash, ({ vec_add2 (nses, ns, 1); ns->name = (u8 *)(p->key); ns->value = (u8 *)(p->value[0]); })); - /* *INDENT-ON* */ if (vec_len (nses) == 0) return s; |