From 3be6e41147632ee1bc2105f4c6e4149df6c26519 Mon Sep 17 00:00:00 2001 From: David Lamparter Date: Sat, 8 Sep 2018 18:25:45 +0200 Subject: [PATCH] isisd: silence SA warnings As suggested by Renato Westphal. Signed-off-by: David Lamparter --- isisd/isis_spf.c | 5 +---- isisd/isis_spf_private.h | 7 +++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/isisd/isis_spf.c b/isisd/isis_spf.c index 8f8cfb3078..6a7528623c 100644 --- a/isisd/isis_spf.c +++ b/isisd/isis_spf.c @@ -650,16 +650,13 @@ lspfragloop: } } - if (!pseudo_lsp && spftree->family == AF_INET + if (!fabricd && !pseudo_lsp && spftree->family == AF_INET && spftree->mtid == ISIS_MT_IPV4_UNICAST) { struct isis_item_list *reachs[] = { &lsp->tlvs->oldstyle_ip_reach, &lsp->tlvs->oldstyle_ip_reach_ext}; for (unsigned int i = 0; i < array_size(reachs); i++) { - if (fabricd) - continue; - vtype = i ? VTYPE_IPREACH_EXTERNAL : VTYPE_IPREACH_INTERNAL; diff --git a/isisd/isis_spf_private.h b/isisd/isis_spf_private.h index 664ddc3f29..af552e0ed1 100644 --- a/isisd/isis_spf_private.h +++ b/isisd/isis_spf_private.h @@ -238,9 +238,12 @@ static void isis_vertex_queue_append(struct isis_vertex_queue *queue, __attribute__((__unused__)) static struct isis_vertex *isis_vertex_queue_last(struct isis_vertex_queue *queue) { - assert(!queue->insert_counter); + struct listnode *tail; - return listgetdata(listtail(queue->l.list)); + assert(!queue->insert_counter); + tail = listtail(queue->l.list); + assert(tail); + return listgetdata(tail); } __attribute__((__unused__)) -- 2.39.5