From: Christian Franke Date: Tue, 10 Nov 2015 16:45:03 +0000 (+0100) Subject: ripd, isisd: fix warnings that make the build fail X-Git-Tag: frr-2.0-rc1~1026 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=85b123a4bf2987857d16dfe42a5faa0eff1c8f67;p=matthieu%2Ffrr.git ripd, isisd: fix warnings that make the build fail These issues have been found by running buildtest.sh using GCC 5.2.0 and Clang 3.7.0 Fixes pointer checks that can never be null Signed-off-by: Christian Franke Tested-by: NetDEF CI System Signed-off-by: Donald Sharp --- diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c index 414885fc4d..fb14a21f0d 100644 --- a/isisd/isis_adjacency.c +++ b/isisd/isis_adjacency.c @@ -203,7 +203,7 @@ isis_adj_state_change (struct isis_adjacency *adj, enum isis_adj_state new_state if (dyn) adj_name = (const char *)dyn->name.name; else - adj_name = adj->sysid ? sysid_print (adj->sysid) : "unknown"; + adj_name = sysid_print (adj->sysid); zlog_info ("%%ADJCHANGE: Adjacency to %s (%s) changed from %s to %s, %s", adj_name, @@ -314,8 +314,8 @@ isis_adj_print (struct isis_adjacency *adj) zlog_debug ("%s", dyn->name.name); zlog_debug ("SystemId %20s SNPA %s, level %d\nHolding Time %d", - adj->sysid ? sysid_print (adj->sysid) : "unknown", - snpa_print (adj->snpa), adj->level, adj->hold_time); + sysid_print (adj->sysid), snpa_print (adj->snpa), + adj->level, adj->hold_time); if (adj->ipv4_addrs && listcount (adj->ipv4_addrs) > 0) { zlog_debug ("IPv4 Address(es):"); diff --git a/ripd/ripd.c b/ripd/ripd.c index 2524588ee0..acac8c1be7 100644 --- a/ripd/ripd.c +++ b/ripd/ripd.c @@ -2504,7 +2504,7 @@ rip_update_process (int route_type) if (IS_RIP_DEBUG_EVENT) zlog_debug("SEND UPDATE to %s ifindex %d", - (ifp->name ? ifp->name : "_unknown_"), ifp->ifindex); + ifp->name, ifp->ifindex); /* send update on each connected network */ for (ALL_LIST_ELEMENTS (ifp->connected, ifnode, ifnnode, connected))