summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Franke <chris@opensourcerouting.org>2015-11-10 17:45:03 +0100
committerDonald Sharp <sharpd@cumulusnetworks.com>2015-12-08 14:12:10 -0500
commit1ca8d40f996c0760a1a8931f54044dd7ca9e3f9c (patch)
treedf3274ac9d9d3731894cd5123eb8118ff6a7d8f5
parentc1900e09a7fdd70437f3ba0329868f1eee3f5a1a (diff)
downloadquagga-1ca8d40f996c0760a1a8931f54044dd7ca9e3f9c.tar.bz2
quagga-1ca8d40f996c0760a1a8931f54044dd7ca9e3f9c.tar.xz
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 <chris@opensourcerouting.org> Tested-by: NetDEF CI System <cisystem@netdef.org> Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
-rw-r--r--isisd/isis_adjacency.c6
-rw-r--r--ripd/ripd.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index a485575b..b8d28b37 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 b708889f..870873d5 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -2574,7 +2574,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))