From: Renato Westphal <renato@opensourcerouting.org>
Date: Thu, 29 Nov 2018 19:05:40 +0000 (-0200)
Subject: ripd: remove leftovers from the old sighup handler
X-Git-Tag: frr-7.1-dev~95^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a3d29c6a4981027159d594297e466d9b92ab6b1b;p=matthieu%2Ffrr.git

ripd: remove leftovers from the old sighup handler

Commit bc1bdde2f6 removed the rip_reset() function but didn't remove
other functions that were only called by rip_reset(). Remove them
now (dead code).

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---

diff --git a/ripd/rip_debug.c b/ripd/rip_debug.c
index 2ce289e38f..3356d99c2a 100644
--- a/ripd/rip_debug.c
+++ b/ripd/rip_debug.c
@@ -204,13 +204,6 @@ static int config_write_debug(struct vty *vty)
 	return write;
 }
 
-void rip_debug_reset(void)
-{
-	rip_debug_event = 0;
-	rip_debug_packet = 0;
-	rip_debug_zebra = 0;
-}
-
 void rip_debug_init(void)
 {
 	rip_debug_event = 0;
diff --git a/ripd/rip_debug.h b/ripd/rip_debug.h
index c3b15d2e15..3d819ccd0b 100644
--- a/ripd/rip_debug.h
+++ b/ripd/rip_debug.h
@@ -47,6 +47,5 @@ extern unsigned long rip_debug_packet;
 extern unsigned long rip_debug_zebra;
 
 extern void rip_debug_init(void);
-extern void rip_debug_reset(void);
 
 #endif /* _ZEBRA_RIP_DEBUG_H */
diff --git a/ripd/rip_interface.c b/ripd/rip_interface.c
index 3d11ba1464..96b1cd8938 100644
--- a/ripd/rip_interface.c
+++ b/ripd/rip_interface.c
@@ -531,15 +531,6 @@ static void rip_interface_reset(struct rip_interface *ri)
 	rip_interface_clean(ri);
 }
 
-void rip_interfaces_reset(void)
-{
-	struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT);
-	struct interface *ifp;
-
-	FOR_ALL_INTERFACES (vrf, ifp)
-		rip_interface_reset(ifp->info);
-}
-
 int rip_if_down(struct interface *ifp)
 {
 	struct route_node *rp;
diff --git a/ripd/rip_routemap.c b/ripd/rip_routemap.c
index b69b2466d5..b34f944c9e 100644
--- a/ripd/rip_routemap.c
+++ b/ripd/rip_routemap.c
@@ -517,11 +517,6 @@ static struct route_map_rule_cmd route_set_tag_cmd = {
 #define MATCH_STR "Match values from routing table\n"
 #define SET_STR "Set values in destination routing protocol\n"
 
-void rip_route_map_reset()
-{
-	;
-}
-
 /* Route-map init */
 void rip_route_map_init()
 {
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index 20f543a258..fff8681775 100644
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -147,11 +147,6 @@ static int rip_zebra_read_route(int command, struct zclient *zclient,
 	return 0;
 }
 
-void rip_zclient_reset(void)
-{
-	zclient_reset(zclient);
-}
-
 void rip_redistribute_conf_update(int type)
 {
 	zclient_redistribute(ZEBRA_REDISTRIBUTE_ADD, zclient, AFI_IP, type,
diff --git a/ripd/ripd.h b/ripd/ripd.h
index d4fb230a20..91fab2a7a2 100644
--- a/ripd/ripd.h
+++ b/ripd/ripd.h
@@ -376,17 +376,14 @@ extern void rip_init(void);
 extern void rip_clean(void);
 extern void rip_clean_network(void);
 extern void rip_interfaces_clean(void);
-extern void rip_interfaces_reset(void);
 extern int rip_passive_nondefault_set(const char *ifname);
 extern int rip_passive_nondefault_unset(const char *ifname);
 extern void rip_passive_nondefault_clean(void);
 extern void rip_if_init(void);
 extern void rip_if_down_all(void);
 extern void rip_route_map_init(void);
-extern void rip_route_map_reset(void);
 extern void rip_zclient_init(struct thread_master *);
 extern void rip_zclient_stop(void);
-extern void rip_zclient_reset(void);
 extern int if_check_address(struct in_addr addr);
 extern int rip_create(int socket);