diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2018-10-23 12:31:25 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2018-10-23 12:31:25 +0200 |
| commit | 064518517c57024e65e177ee79c0a98f9f28ef6e (patch) | |
| tree | dcc1d14ad647a210ef2d93da4fe827d9337ada4b /lib/routemap.c | |
| parent | 920b243c1b154476ab9a629ac002817ead5a1efa (diff) | |
| parent | d17743d390757c170bad6a776de43d1809afe3c3 (diff) | |
Merge branch 'pull/3197'
...with a nit fix
Signed-off-by: David Lamparter <equinox@diac24.net>
Diffstat (limited to 'lib/routemap.c')
| -rw-r--r-- | lib/routemap.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/routemap.c b/lib/routemap.c index 6d6267af6b..5c6d106d83 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -631,7 +631,7 @@ static unsigned int route_map_hash_key_make(void *p) return string_hash_make(map->name); } -static int route_map_hash_cmp(const void *p1, const void *p2) +static bool route_map_hash_cmp(const void *p1, const void *p2) { const struct route_map *map1 = p1; const struct route_map *map2 = p2; @@ -639,14 +639,14 @@ static int route_map_hash_cmp(const void *p1, const void *p2) if (map1->deleted == map2->deleted) { if (map1->name && map2->name) { if (!strcmp(map1->name, map2->name)) { - return 1; + return true; } } else if (!map1->name && !map2->name) { - return 1; + return true; } } - return 0; + return false; } enum route_map_upd8_type { @@ -676,7 +676,6 @@ struct route_map_dep { struct hash *route_map_dep_hash[ROUTE_MAP_DEP_MAX]; static unsigned int route_map_dep_hash_make_key(void *p); -static int route_map_dep_hash_cmp(const void *p1, const void *p2); static void route_map_clear_all_references(char *rmap_name); static void route_map_rule_delete(struct route_map_rule_list *, struct route_map_rule *); @@ -1624,12 +1623,12 @@ void route_map_event_hook(void (*func)(route_map_event_t, const char *)) } /* Routines for route map dependency lists and dependency processing */ -static int route_map_rmap_hash_cmp(const void *p1, const void *p2) +static bool route_map_rmap_hash_cmp(const void *p1, const void *p2) { return (strcmp((const char *)p1, (const char *)p2) == 0); } -static int route_map_dep_hash_cmp(const void *p1, const void *p2) +static bool route_map_dep_hash_cmp(const void *p1, const void *p2) { return (strcmp(((const struct route_map_dep *)p1)->dep_name, |