From 2f1e116510e3ff13a40119527d2931beee47cde6 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 21 Aug 2019 13:22:43 +0930 Subject: [PATCH] gossipd: use htable_count() rather than reaching into htable struct. Now ccan/htable provides the helper, let's use it. Signed-off-by: Rusty Russell --- gossipd/gossipd.c | 4 ++-- gossipd/routing.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gossipd/gossipd.c b/gossipd/gossipd.c index 5f71ec4a6..b19a64a55 100644 --- a/gossipd/gossipd.c +++ b/gossipd/gossipd.c @@ -2677,13 +2677,13 @@ static struct io_plan *getnodes(struct io_conn *conn, struct daemon *daemon, struct node_map_iter it; size_t i = 0; node_arr = tal_arr(tmpctx, struct gossip_getnodes_entry, - daemon->rstate->nodes->raw.elems); + node_map_count(daemon->rstate->nodes)); n = node_map_first(daemon->rstate->nodes, &it); while (n != NULL) { add_node_entry(node_arr, daemon, n, &node_arr[i++]); n = node_map_next(daemon->rstate->nodes, &it); } - assert(i == daemon->rstate->nodes->raw.elems); + assert(i == node_map_count(daemon->rstate->nodes)); } /* FIXME: towire wants array of pointers. */ diff --git a/gossipd/routing.c b/gossipd/routing.c index 80dc82779..24a0f6f70 100644 --- a/gossipd/routing.c +++ b/gossipd/routing.c @@ -320,8 +320,7 @@ static void remove_chan_from_node(struct routing_state *rstate, } else { if (!chan_map_del(&node->chans.map, chan)) abort(); - /* FIXME: Expose this in ccan/htable */ - num_chans = node->chans.map.raw.elems; + num_chans = chan_map_count(&node->chans.map); } /* Last channel? Simply delete node (and associated announce) */