From: David Lamparter <equinox@opensourcerouting.org>
Date: Mon, 28 Nov 2016 16:51:45 +0000 (+0100)
Subject: lib: merge-prep lib/command.c (partial revert)
X-Git-Tag: frr-3.0-branchpoint~149
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d7a64489f05d4bfba5e686aae941ef36eaa30688;p=matthieu%2Ffrr.git

lib: merge-prep lib/command.c (partial revert)

This reverts commit 45ef43000030a5801efc6c158786595c31355335,
for lib/command.c (to make a merge conflict go away).

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/lib/command.c b/lib/command.c
index cfadfcef62..e8ba637623 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2089,7 +2089,7 @@ cmd_describe_command_real (vector vline, struct vty *vty, int *status)
   unsigned int index;
   int ret;
   enum match_type match;
-  char *command = NULL;
+  char *command;
   vector matches = NULL;
   vector match_vector;
   uint32_t command_found = 0;