lib: fix rebase conflicts

Changes:
- Remove unused variable.
- Make prototypes static like the declaration.
- Fix new compilers complaint about uninitialized values.
- Fix new compilers complaint about small buffer for `snprintf` concatenation.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>

diff --git a/lib/filter.c b/lib/filter.c
index fc4f4f51785f876005b694096bddb40e69a6c5ba..c9a1d683c51849ddb880aed426ff40df0dea5610 100644 (file)
--- a/lib/filter.c
+++ b/lib/filter.c
@@ -383,7 +383,6 @@ void access_list_filter_delete(struct access_list *access,
                               struct filter *filter)
 {
        struct access_master *master;
-       struct filter *replace = filter;
 
        master = access->master;
 

diff --git a/lib/filter_cli.c b/lib/filter_cli.c
index 92230f176ed4446543e7f3b172c1d47f896dae83..1e6d44d27f1ea9a5f0c8338031f332784a69647a 100644 (file)
--- a/lib/filter_cli.c
+++ b/lib/filter_cli.c
@@ -1126,7 +1126,7 @@ DEFPY(
        int64_t sseq;
        char xpath[XPATH_MAXLEN];
        char xpath_entry[XPATH_MAXLEN + 32];
-       char xpath_value[XPATH_MAXLEN + 64];
+       char xpath_value[XPATH_MAXLEN + 128];
 
        /*
         * Create the prefix-list first, so we can generate sequence if
@@ -1310,7 +1310,7 @@ DEFPY(
        int64_t sseq;
        char xpath[XPATH_MAXLEN];
        char xpath_entry[XPATH_MAXLEN + 32];
-       char xpath_value[XPATH_MAXLEN + 64];
+       char xpath_value[XPATH_MAXLEN + 128];
 
        /*
         * Create the prefix-list first, so we can generate sequence if

diff --git a/lib/filter_nb.c b/lib/filter_nb.c
index 23cea50870effb1c832ca701634789f7cf039758..3e22dcd1485addff35e89a72da0cf420457ba814 100644 (file)
--- a/lib/filter_nb.c
+++ b/lib/filter_nb.c
@@ -415,7 +415,7 @@ static int lib_access_list_legacy_entry_destination_any_destroy(
  */
 static int lib_access_list_create(struct nb_cb_create_args *args)
 {
-       struct access_list *acl;
+       struct access_list *acl = NULL;
        const char *acl_name;
        int type;
 
@@ -685,7 +685,7 @@ static int lib_access_list_entry_any_destroy(struct nb_cb_destroy_args *args)
  */
 static int lib_prefix_list_create(struct nb_cb_create_args *args)
 {
-       struct prefix_list *pl;
+       struct prefix_list *pl = NULL;
        const char *name;
        int type;