From: Renato Westphal <renato@opensourcerouting.org>
Date: Wed, 19 Apr 2017 18:28:43 +0000 (-0300)
Subject: ldpd: remove unnecessary checks if a signal was caught
X-Git-Tag: reindent-master-before~214^2~9
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d1fcf957d131bb4c5b04144ee660207a3165ee07;p=matthieu%2Ffrr.git

ldpd: remove unnecessary checks if a signal was caught

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

diff --git a/ldpd/lde.c b/ldpd/lde.c
index 24b993f094..1c2d681dc7 100644
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -119,13 +119,6 @@ static struct quagga_signal_t lde_signals[] =
 	},
 };
 
-static void
-lde_sleep (void)
-{
-	sleep(1);
-	if (lde_signals[0].caught || lde_signals[1].caught)
-		lde_shutdown();
-}
 struct zclient *zclient_sync = NULL;
 static void
 zclient_sync_init(u_short instance)
@@ -138,13 +131,13 @@ zclient_sync_init(u_short instance)
 	zclient_sync->instance = instance;
 	while (zclient_socket_connect (zclient_sync) < 0) {
 		fprintf(stderr, "Error connecting synchronous zclient!\n");
-		lde_sleep();
+		sleep(1);
 	}
 
 	/* Connect to label manager */
 	while (lm_label_manager_connect (zclient_sync) != 0) {
 		fprintf(stderr, "Error connecting to label manager!\n");
-		lde_sleep();
+		sleep(1);
 	}
 }
 
@@ -1628,7 +1621,7 @@ lde_label_list_init(void)
 	/* get first chunk */
 	while (lde_get_label_chunk () != 0) {
 		fprintf(stderr, "Error getting first label chunk!\n");
-		lde_sleep();
+		sleep(1);
 	}
 }