As any new compiler version, clang 3.6 has new warnings, one of these
being that it now warns for testing whether the address of an array will
be true.

Of course there is no point in this check for the sysid, so let's always
just print the sysid.

Signed-off-by: David Lamparter <[email protected]>
---

This is the only new warning with clang 3.6 that I triggered.  I'm
positively surprised :)

Unfortunately I can't install gcc 5.1 yet because it has a system-wide
C++ ABI change, so right now my testpool is gcc 4.9.2, clang 3.6.0 and
icc 14.0.3.

---
 isisd/isis_adjacency.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/isisd/isis_adjacency.c b/isisd/isis_adjacency.c
index a352436..a485575 100644
--- a/isisd/isis_adjacency.c
+++ b/isisd/isis_adjacency.c
@@ -377,14 +377,8 @@ isis_adj_print_vty (struct isis_adjacency *adj, struct vty 
*vty, char detail)
   dyn = dynhn_find_by_id (adj->sysid);
   if (dyn)
     vty_out (vty, "  %-20s", dyn->name.name);
-  else if (adj->sysid)
-    {
-      vty_out (vty, "  %-20s", sysid_print (adj->sysid));
-    }
   else
-    {
-      vty_out (vty, "  unknown ");
-    }
+    vty_out (vty, "  %-20s", sysid_print (adj->sysid));
 
   if (detail == ISIS_UI_LEVEL_BRIEF)
     {
-- 
2.3.6


_______________________________________________
Quagga-dev mailing list
[email protected]
https://lists.quagga.net/mailman/listinfo/quagga-dev

Reply via email to