Merge pull request #2760 from donaldsharp/bgp_patch_from_dev

[mirror_frr.git] / lib / routemap.c

diff --git a/lib/routemap.c b/lib/routemap.c
index ea61043a8d2adf78d8d4335e1a7981fd61c2a726..6c4585365a34cb3eef2aff976601a1b6b76564bb 100644 (file)
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -722,7 +722,7 @@ static void route_map_delete(struct route_map *map)
 
        /* Clear all dependencies */
        route_map_clear_all_references(name);
-       map->deleted = 1;
+       map->deleted = true;
        /* Execute deletion hook. */
        if (route_map_master.delete_hook) {
                (*route_map_master.delete_hook)(name);
@@ -751,7 +751,7 @@ struct route_map *route_map_lookup_by_name(const char *name)
        return map;
 }
 
-int route_map_mark_updated(const char *name, int del_later)
+int route_map_mark_updated(const char *name)
 {
        struct route_map *map;
        int ret = -1;
@@ -762,31 +762,31 @@ int route_map_mark_updated(const char *name, int del_later)
 
        map = route_map_lookup_by_name(name);
 
-       /* If we did not find the routemap with deleted=0 try again
-        * with deleted=1
+       /* If we did not find the routemap with deleted=false try again
+        * with deleted=true
         */
        if (!map) {
                memset(&tmp_map, 0, sizeof(struct route_map));
                tmp_map.name = XSTRDUP(MTYPE_ROUTE_MAP_NAME, name);
-               tmp_map.deleted = 1;
+               tmp_map.deleted = true;
                map = hash_lookup(route_map_master_hash, &tmp_map);
                XFREE(MTYPE_ROUTE_MAP_NAME, tmp_map.name);
        }
 
        if (map) {
-               map->to_be_processed = 1;
+               map->to_be_processed = true;
                ret = 0;
        }
 
        return (ret);
 }
 
-int route_map_clear_updated(struct route_map *map)
+static int route_map_clear_updated(struct route_map *map)
 {
        int ret = -1;
 
        if (map) {
-               map->to_be_processed = 0;
+               map->to_be_processed = false;
                if (map->deleted)
                        route_map_free_map(map);
        }
@@ -807,7 +807,7 @@ static struct route_map *route_map_get(const char *name)
        return map;
 }
 
-void route_map_walk_update_list(int (*route_map_update_fn)(char *name))
+void route_map_walk_update_list(void (*route_map_update_fn)(char *name))
 {
        struct route_map *node;
        struct route_map *nnode = NULL;
@@ -1387,7 +1387,7 @@ int route_map_delete_set(struct route_map_index *index, const char *set_name,
 
 static route_map_result_t
 route_map_apply_match(struct route_map_rule_list *match_list,
-                     struct prefix *prefix, route_map_object_t type,
+                     const struct prefix *prefix, route_map_object_t type,
                      void *object)
 {
        route_map_result_t ret = RMAP_NOMATCH;
@@ -1417,7 +1417,8 @@ route_map_apply_match(struct route_map_rule_list *match_list,
 }
 
 /* Apply route map to the object. */
-route_map_result_t route_map_apply(struct route_map *map, struct prefix *prefix,
+route_map_result_t route_map_apply(struct route_map *map,
+                                  const struct prefix *prefix,
                                   route_map_object_t type, void *object)
 {
        static int recursion = 0;
@@ -2743,7 +2744,7 @@ void route_map_finish(void)
        /* cleanup route_map */
        while (route_map_master.head) {
                struct route_map *map = route_map_master.head;
-               map->to_be_processed = 0;
+               map->to_be_processed = false;
                route_map_delete(map);
        }