From ea2c03e2e2bcc319e04ba7203762c9af9495a14b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 13 Nov 2018 14:33:53 +1030 Subject: [PATCH] gossipd: don't have code to exit final loop; we always leave via master_gone. Signed-off-by: Rusty Russell --- gossipd/gossipd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c index c7459f44d..59ec134ed 100644 --- a/gossipd/gossipd.c +++ b/gossipd/gossipd.c @@ -2166,6 +2166,7 @@ static struct io_plan *recv_req(struct io_conn *conn, static void master_gone(struct daemon_conn *master UNUSED) { + daemon_shutdown(); /* Can't tell master, it's gone. */ exit(2); } @@ -2195,12 +2196,6 @@ int main(int argc, char *argv[]) struct timer *expired = NULL; io_loop(&daemon->timers, &expired); - if (!expired) { - break; - } else { - timer_expired(daemon, expired); - } + timer_expired(daemon, expired); } - daemon_shutdown(); - return 0; }