diff options
| author | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2020-04-29 15:28:38 -0300 |
|---|---|---|
| committer | Rafael Zalamena <rzalamena@opensourcerouting.org> | 2020-06-05 14:36:52 -0300 |
| commit | ff94358e54442c7dae0458ff6f2cee05c90b9247 (patch) | |
| tree | 914422221096ba92c49813ff74dec0620f7106f5 | |
| parent | fb8884f355d6db9626fb78c99efd26d479404376 (diff) | |
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>
| -rw-r--r-- | lib/filter.c | 1 | ||||
| -rw-r--r-- | lib/filter_cli.c | 4 | ||||
| -rw-r--r-- | lib/filter_nb.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/lib/filter.c b/lib/filter.c index fc4f4f5178..c9a1d683c5 100644 --- 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 92230f176e..1e6d44d27f 100644 --- 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 23cea50870..3e22dcd148 100644 --- 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; |
