]> git.puffer.fish Git - mirror/frr.git/commitdiff
lib: merge-prep lib/command.c (partial revert)
authorDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 16:51:45 +0000 (17:51 +0100)
committerDavid Lamparter <equinox@opensourcerouting.org>
Mon, 28 Nov 2016 16:52:24 +0000 (17:52 +0100)
This reverts commit 45ef43000030a5801efc6c158786595c31355335,
for lib/command.c (to make a merge conflict go away).

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
lib/command.c

index cfadfcef62a715321030400b115b2f865cb666a9..e8ba63762300d677e58ac594b64c6252e24b696c 100644 (file)
@@ -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;