diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-06-20 02:44:15 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2018-06-20 02:44:15 +0200 |
| commit | 7096e93875b2deceb6e16cf3120c0adb59611279 (patch) | |
| tree | 0cae4a74eb4bcca7cfbaa1b5dfc9333d51350f25 | |
| parent | Merge pull request #2459 from pacovn/Coverity_1469898_Uninitialized_scalar_va... (diff) | |
| download | frr-7096e93875b2deceb6e16cf3120c0adb59611279.tar.xz frr-7096e93875b2deceb6e16cf3120c0adb59611279.zip | |
bgpd, lib, pimd: Remove unused variable.
route_map_mark_updated has a `int del_later` variable
that is passed in but never used. Just remove it.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
| -rw-r--r-- | bgpd/bgp_routemap.c | 6 | ||||
| -rw-r--r-- | lib/routemap.c | 2 | ||||
| -rw-r--r-- | lib/routemap.h | 2 | ||||
| -rw-r--r-- | pimd/pim_routemap.c | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index cbacd6b4f..14c1c33a3 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -3172,7 +3172,7 @@ static void bgp_route_map_mark_update(const char *rmap_name) static void bgp_route_map_add(const char *rmap_name) { - if (route_map_mark_updated(rmap_name, 0) == 0) + if (route_map_mark_updated(rmap_name) == 0) bgp_route_map_mark_update(rmap_name); route_map_notify_dependencies(rmap_name, RMAP_EVENT_MATCH_ADDED); @@ -3180,7 +3180,7 @@ static void bgp_route_map_add(const char *rmap_name) static void bgp_route_map_delete(const char *rmap_name) { - if (route_map_mark_updated(rmap_name, 1) == 0) + if (route_map_mark_updated(rmap_name) == 0) bgp_route_map_mark_update(rmap_name); route_map_notify_dependencies(rmap_name, RMAP_EVENT_MATCH_DELETED); @@ -3188,7 +3188,7 @@ static void bgp_route_map_delete(const char *rmap_name) static void bgp_route_map_event(route_map_event_t event, const char *rmap_name) { - if (route_map_mark_updated(rmap_name, 0) == 0) + if (route_map_mark_updated(rmap_name) == 0) bgp_route_map_mark_update(rmap_name); route_map_notify_dependencies(rmap_name, RMAP_EVENT_MATCH_ADDED); diff --git a/lib/routemap.c b/lib/routemap.c index 892b19dac..4601da759 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -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; diff --git a/lib/routemap.h b/lib/routemap.h index 990c7fa72..4ec4ce1a0 100644 --- a/lib/routemap.h +++ b/lib/routemap.h @@ -215,7 +215,7 @@ extern route_map_result_t route_map_apply(struct route_map *map, extern void route_map_add_hook(void (*func)(const char *)); extern void route_map_delete_hook(void (*func)(const char *)); extern void route_map_event_hook(void (*func)(route_map_event_t, const char *)); -extern int route_map_mark_updated(const char *name, int deleted); +extern int route_map_mark_updated(const char *name); extern int route_map_clear_updated(struct route_map *rmap); extern void route_map_walk_update_list(int (*update_fn)(char *name)); extern void route_map_upd8_dependency(route_map_event_t type, const char *arg, diff --git a/pimd/pim_routemap.c b/pimd/pim_routemap.c index 6d06229b9..8f6309340 100644 --- a/pimd/pim_routemap.c +++ b/pimd/pim_routemap.c @@ -35,7 +35,7 @@ static void pim_route_map_mark_update(const char *rmap_name) static void pim_route_map_add(const char *rmap_name) { - if (route_map_mark_updated(rmap_name, 0) == 0) + if (route_map_mark_updated(rmap_name) == 0) pim_route_map_mark_update(rmap_name); route_map_notify_dependencies(rmap_name, RMAP_EVENT_MATCH_ADDED); @@ -43,7 +43,7 @@ static void pim_route_map_add(const char *rmap_name) static void pim_route_map_delete(const char *rmap_name) { - if (route_map_mark_updated(rmap_name, 1) == 0) + if (route_map_mark_updated(rmap_name) == 0) pim_route_map_mark_update(rmap_name); route_map_notify_dependencies(rmap_name, RMAP_EVENT_MATCH_DELETED); @@ -51,7 +51,7 @@ static void pim_route_map_delete(const char *rmap_name) static void pim_route_map_event(route_map_event_t event, const char *rmap_name) { - if (route_map_mark_updated(rmap_name, 0) == 0) + if (route_map_mark_updated(rmap_name) == 0) pim_route_map_mark_update(rmap_name); route_map_notify_dependencies(rmap_name, RMAP_EVENT_MATCH_ADDED); |