From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 20 Jun 2018 01:18:33 +0000 (-0400)
Subject: bgpd, lib, zebra: Remove unnecessary return
X-Git-Tag: frr-6.1-dev~285^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F2499%2Fhead;p=mirror%2Ffrr.git

bgpd, lib, zebra: Remove unnecessary return

The route_map_walk_update_list callback function
never uses the return code, so just remove it.

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

diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 14c1c33a31..9f3bec81d3 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3112,7 +3112,7 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
 	}
 }
 
-static int bgp_route_map_process_update_cb(char *rmap_name)
+static void bgp_route_map_process_update_cb(char *rmap_name)
 {
 	struct listnode *node, *nnode;
 	struct bgp *bgp;
@@ -3127,8 +3127,6 @@ static int bgp_route_map_process_update_cb(char *rmap_name)
 	}
 
 	vpn_policy_routemap_event(rmap_name);
-
-	return 0;
 }
 
 int bgp_route_map_update_timer(struct thread *thread)
diff --git a/lib/routemap.c b/lib/routemap.c
index b2c1929507..056c793454 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -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;
diff --git a/lib/routemap.h b/lib/routemap.h
index e653a8a788..0aeba7e1f6 100644
--- a/lib/routemap.h
+++ b/lib/routemap.h
@@ -216,7 +216,7 @@ 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);
-extern void route_map_walk_update_list(int (*update_fn)(char *name));
+extern void route_map_walk_update_list(void (*update_fn)(char *name));
 extern void route_map_upd8_dependency(route_map_event_t type, const char *arg,
 				      const char *rmap_name);
 extern void route_map_notify_dependencies(const char *affected_name,
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 8e368c257e..6d3c2b2265 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -1282,13 +1282,11 @@ static struct route_map_rule_cmd route_set_src_cmd = {
 	"src", route_set_src, route_set_src_compile, route_set_src_free,
 };
 
-static int zebra_route_map_process_update_cb(char *rmap_name)
+static void zebra_route_map_process_update_cb(char *rmap_name)
 {
 	if (IS_ZEBRA_DEBUG_EVENT)
 		zlog_debug("Event handler for route-map: %s",
 			   rmap_name);
-
-	return 0;
 }
 
 static int zebra_route_map_update_timer(struct thread *thread)