diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/atomlist.c | 2 | ||||
| -rw-r--r-- | lib/base64.c | 4 | ||||
| -rw-r--r-- | lib/command_py.c | 3 | ||||
| -rw-r--r-- | lib/elf_py.c | 2 | ||||
| -rw-r--r-- | lib/plist.c | 4 | ||||
| -rw-r--r-- | lib/privs.c | 2 | ||||
| -rw-r--r-- | lib/route_types.txt | 2 | ||||
| -rw-r--r-- | lib/routemap_cli.c | 37 | ||||
| -rw-r--r-- | lib/subdir.am | 2 |
9 files changed, 15 insertions, 43 deletions
diff --git a/lib/atomlist.c b/lib/atomlist.c index b7c9516a00..2631d4fa78 100644 --- a/lib/atomlist.c +++ b/lib/atomlist.c @@ -267,7 +267,7 @@ static void atomsort_del_core(struct atomsort_head *h, memory_order_consume); /* track the beginning of a chain of deleted items - * this is neccessary to make this lock-free; we can + * this is necessary to make this lock-free; we can * complete deletions started by other threads. */ if (!atomptr_l(prevval)) { diff --git a/lib/base64.c b/lib/base64.c index e3f238969b..6f0be039f1 100644 --- a/lib/base64.c +++ b/lib/base64.c @@ -3,6 +3,10 @@ * For details, see http://sourceforge.net/projects/libb64 */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + #include "base64.h" static const int CHARS_PER_LINE = 72; diff --git a/lib/command_py.c b/lib/command_py.c index 90344ae1e5..6301eec5e8 100644 --- a/lib/command_py.c +++ b/lib/command_py.c @@ -28,6 +28,9 @@ * setup & these trample over each other. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include <Python.h> #include "structmember.h" #include <string.h> diff --git a/lib/elf_py.c b/lib/elf_py.c index 5289faece4..75d2d6007f 100644 --- a/lib/elf_py.c +++ b/lib/elf_py.c @@ -50,10 +50,10 @@ #define PY_SSIZE_T_CLEAN -#include <Python.h> #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include <Python.h> #include "structmember.h" #include <string.h> #include <stdlib.h> diff --git a/lib/plist.c b/lib/plist.c index e7647fb2a7..d8ef9dcbd5 100644 --- a/lib/plist.c +++ b/lib/plist.c @@ -1568,8 +1568,10 @@ static void prefix_list_reset_afi(afi_t afi, int orf) if (master == NULL) return; - while ((plist = plist_pop(&master->str))) + while ((plist = plist_first(&master->str))) { prefix_list_delete(plist); + plist_pop(&master->str); + } master->recent = NULL; } diff --git a/lib/privs.c b/lib/privs.c index b3f51267d1..24a15a0c0b 100644 --- a/lib/privs.c +++ b/lib/privs.c @@ -684,7 +684,7 @@ void zprivs_init(struct zebra_privs_t *zprivs) #else /* !HAVE_CAPABILITIES */ /* we dont have caps. we'll need to maintain rid and saved uid - * and change euid back to saved uid (who we presume has all neccessary + * and change euid back to saved uid (who we presume has all necessary * privileges) whenever we are asked to raise our privileges. * * This is not worth that much security wise, but all we can do. diff --git a/lib/route_types.txt b/lib/route_types.txt index 77639070c9..a82273a6dc 100644 --- a/lib/route_types.txt +++ b/lib/route_types.txt @@ -3,7 +3,7 @@ # Used to construct route_types.c and route_types.h # # comma-seperated fields of either 2 fields (help strings) or 7 fields. -# White space before and after the comma seperators is stripped. +# White space before and after the comma separators is stripped. # Lines /beginning/ with # are comments. # #### diff --git a/lib/routemap_cli.c b/lib/routemap_cli.c index 5597064d20..315007be1c 100644 --- a/lib/routemap_cli.c +++ b/lib/routemap_cli.c @@ -1434,41 +1434,6 @@ void route_map_optimization_disabled_show(struct vty *vty, name); } -#if CONFDATE > 20220409 -CPP_NOTICE("Time to remove old route-map optimization command") -#endif - -DEFPY_HIDDEN( - routemap_optimization, routemap_optimization_cmd, - "[no] route-map optimization", - NO_STR - "route-map\n" - "optimization\n") -{ - const struct lyd_node *rmi_dnode; - const char *rm_name; - char xpath[XPATH_MAXLEN]; - - vty_out(vty, - "%% This command is deprecated. Please, use `route-map NAME optimization` from the config node.\n"); - - rmi_dnode = - yang_dnode_get(vty->candidate_config->dnode, VTY_CURR_XPATH); - if (!rmi_dnode) { - vty_out(vty, "%% Failed to get RMI dnode in candidate DB\n"); - return CMD_WARNING_CONFIG_FAILED; - } - - rm_name = yang_dnode_get_string(rmi_dnode, "../name"); - - snprintf( - xpath, sizeof(xpath), - "/frr-route-map:lib/route-map[name='%s']/optimization-disabled", - rm_name); - nb_cli_enqueue_change(vty, xpath, NB_OP_MODIFY, no ? "true" : "false"); - return nb_cli_apply_changes(vty, NULL); -} - static int route_map_config_write(struct vty *vty) { const struct lyd_node *dnode; @@ -1587,6 +1552,4 @@ void route_map_cli_init(void) install_element(RMAP_NODE, &set_srte_color_cmd); install_element(RMAP_NODE, &no_set_srte_color_cmd); - - install_element(RMAP_NODE, &routemap_optimization_cmd); } diff --git a/lib/subdir.am b/lib/subdir.am index d1df9cb3d9..c3899c4e0f 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -588,7 +588,7 @@ DISTCLEANFILES += lib/route_types.h if GIT_VERSION # bit of a trick here to always have up-to-date git stamps without triggering -# unneccessary rebuilds. .PHONY causes the .tmp file to be rebuilt always, +# unnecessary rebuilds. .PHONY causes the .tmp file to be rebuilt always, # but if we use that on gitversion.h it'll ripple through the .c file deps. # (even if gitversion.h's file timestamp doesn't change, make will think it # did, because of .PHONY...) |