From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 9 Aug 2016 20:28:35 +0000 (+0000)
Subject: lib: Revert breaking change to cmp_node
X-Git-Tag: frr-3.0-branchpoint~129^2~255
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e52c05cd8079defe2c7524e61b3241174fa969d0;p=matthieu%2Ffrr.git

lib: Revert breaking change to cmp_node

Bad conditional refactor broke graph deduplication
and thus disambiguation precedence

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/lib/command_parse.y b/lib/command_parse.y
index bbdf11c6e8..690832357a 100644
--- a/lib/command_parse.y
+++ b/lib/command_parse.y
@@ -478,8 +478,11 @@ cmp_node (struct graph_node *first, struct graph_node *second)
   switch (first->type) {
     case WORD_GN:
     case VARIABLE_GN:
-      if (first->text && second->text && strcmp (first->text, second->text))
-        return 0;
+      if (first->text && second->text)
+        {
+          if (strcmp (first->text, second->text))
+          return 0;
+        }
       else if (first->text != second->text) return 0;
       break;
     case RANGE_GN: