diff options
| author | Russ White <russ@riw.us> | 2018-08-16 11:32:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 11:32:41 -0400 |
| commit | 4b0d7894cba17263015b7a5d0f9436d10a492ebc (patch) | |
| tree | f263dd99bf2740a5cd48c620a67b5f21cc01660e /lib/routemap.c | |
| parent | 783d61be04d7b73afb37c9590822b895b3795b94 (diff) | |
| parent | 9ea660be3ae4b1914a09a0f569851575fa138f18 (diff) | |
Merge pull request #2846 from donaldsharp/backet_data
Backet data
Diffstat (limited to 'lib/routemap.c')
| -rw-r--r-- | lib/routemap.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/lib/routemap.c b/lib/routemap.c index 4e8682f312..4125bb53ae 100644 --- a/lib/routemap.c +++ b/lib/routemap.c @@ -1545,7 +1545,7 @@ static void route_map_clear_reference(struct hash_backet *backet, void *arg) struct route_map_dep *dep = (struct route_map_dep *)backet->data; char *rmap_name; - if (dep && arg) { + if (arg) { rmap_name = (char *)hash_release(dep->dep_rmap_hash, (void *)arg); if (rmap_name) { @@ -1601,9 +1601,8 @@ static void route_map_print_dependency(struct hash_backet *backet, void *data) char *rmap_name = (char *)backet->data; char *dep_name = (char *)data; - if (rmap_name) - zlog_debug("%s: Dependency for %s: %s", __FUNCTION__, dep_name, - rmap_name); + zlog_debug("%s: Dependency for %s: %s", __FUNCTION__, dep_name, + rmap_name); } static int route_map_dep_update(struct hash *dephash, const char *dep_name, @@ -1725,18 +1724,14 @@ static struct hash *route_map_get_dep_hash(route_map_event_t event) static void route_map_process_dependency(struct hash_backet *backet, void *data) { - char *rmap_name; + char *rmap_name = (char *)backet->data; route_map_event_t type = (route_map_event_t)(ptrdiff_t)data; - rmap_name = (char *)backet->data; - - if (rmap_name) { - if (rmap_debug) - zlog_debug("%s: Notifying %s of dependency", - __FUNCTION__, rmap_name); - if (route_map_master.event_hook) - (*route_map_master.event_hook)(type, rmap_name); - } + if (rmap_debug) + zlog_debug("%s: Notifying %s of dependency", + __FUNCTION__, rmap_name); + if (route_map_master.event_hook) + (*route_map_master.event_hook)(type, rmap_name); } void route_map_upd8_dependency(route_map_event_t type, const char *arg, |