lib: Fix gcc 9.1 and --enable-werror issues found

Compiling FRR w/ gcc 9.1 and --enable-werror generates some
issues that need to be cleaned up.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/lib/routemap.c b/lib/routemap.c
index 0c75be3323bb19fd2237d28961b8ef444b1fdc54..fb4fc1424765f957b679aafc332d42e159652cd7 100644 (file)
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -906,6 +906,8 @@ static const char *route_map_type_str(enum route_map_type type)
                return "";
                break;
        }
+
+       return "";
 }
 
 static int route_map_empty(struct route_map *map)
@@ -1287,7 +1289,6 @@ int route_map_add_match(struct route_map_index *index, const char *match_name,
        struct route_map_rule *next;
        struct route_map_rule_cmd *cmd;
        void *compile;
-       int replaced = 0;
 
        /* First lookup rule for add match statement. */
        cmd = route_map_lookup_match(match_name);
@@ -1317,7 +1318,6 @@ int route_map_add_match(struct route_map_index *index, const char *match_name,
                        }
 
                        route_map_rule_delete(&index->match_list, rule);
-                       replaced = 1;
                }
        }
 
@@ -1379,7 +1379,6 @@ int route_map_add_set(struct route_map_index *index, const char *set_name,
        struct route_map_rule *next;
        struct route_map_rule_cmd *cmd;
        void *compile;
-       int replaced = 0;
 
        cmd = route_map_lookup_set(set_name);
        if (cmd == NULL)
@@ -1398,10 +1397,8 @@ int route_map_add_set(struct route_map_index *index, const char *set_name,
           route_map_index. */
        for (rule = index->set_list.head; rule; rule = next) {
                next = rule->next;
-               if (rule->cmd == cmd) {
+               if (rule->cmd == cmd)
                        route_map_rule_delete(&index->set_list, rule);
-                       replaced = 1;
-               }
        }
 
        /* Add new route map match rule. */