summaryrefslogtreecommitdiffstats
path: root/lib/command_graph.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-07-14 16:48:41 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-07-14 16:59:44 +0200
commit20a6c6f31fac606910a8794b35783ae9ccd2230b (patch)
tree53e7dcdeae91f932a146ff932c387ca7873e7322 /lib/command_graph.c
parent*: fix GCC 7 switch/case fallthrough warnings (diff)
downloadfrr-20a6c6f31fac606910a8794b35783ae9ccd2230b.tar.xz
frr-20a6c6f31fac606910a8794b35783ae9ccd2230b.zip
*: fix GCC 7 warnings/issues
The label initializer & nhrpd variable are just to shut up GCC 7, the other two are actual bugs. Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib/command_graph.c')
-rw-r--r--lib/command_graph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/command_graph.c b/lib/command_graph.c
index 8cfb33357..4254b91d9 100644
--- a/lib/command_graph.c
+++ b/lib/command_graph.c
@@ -349,7 +349,7 @@ cmd_merge_nodes (struct graph *oldgraph, struct graph *newgraph,
if (i == vector_active (old->to) && direction > 0)
{
assert (vector_count (cnew->from) ==
- cmd_nodes_link (cnew, cnew) ? 2 : 1);
+ (cmd_nodes_link (cnew, cnew) ? 2 : 1));
graph_remove_edge (new, cnew);
cmd_reparent_tree (newgraph, oldgraph, cnew);