- Solve the Coverity Scan PW.ASSIGN_WHERE_COMPARE_MEANT

- Minor refactoring

Signed-off-by: Hung-Weic Chiu <sppsorrg@gmail.com>

diff --git a/lib/command.c b/lib/command.c
index 43b2c478a03fafe6487c630708a4ece0ea0cb043..ff921ff40252b793963958e67b1aa0123fb72983 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -1615,8 +1615,11 @@ permute (struct graph_node *start, struct vty *vty)
       bool skip = false;
       if (stok->type == FORK_TKN && tok->type != FORK_TKN)
         for (ALL_LIST_ELEMENTS_RO (position, ln, gnn))
-           if (gnn == gn && (skip = true))
+           if (gnn == gn)
+           {
+             skip = true;
              break;
+           }
       if (!skip)
         permute (gn, vty);
     }

diff --git a/tools/permutations.c b/tools/permutations.c
index 6e1a37981a7b4044b3bd639346609313b49c0e04..88d1464697c7d0e36b8aa7d7faf49ead6e6f3ca8 100644 (file)
--- a/tools/permutations.c
+++ b/tools/permutations.c
@@ -87,8 +87,11 @@ permute (struct graph_node *start)
       bool skip = false;
       if (stok->type == FORK_TKN && tok->type != FORK_TKN)
         for (ALL_LIST_ELEMENTS_RO (position, ln, gnn))
-           if (gnn == gn && (skip = true))
+           if (gnn == gn)
+           { 
+             skip = true;
              break;
+           }
       if (!skip)
         permute (gn);
     }