From: David Lamparter <equinox@opensourcerouting.org>
Date: Wed, 23 Nov 2016 07:42:27 +0000 (+0100)
Subject: lib: move command_parse_format prototype
X-Git-Tag: frr-3.0-branchpoint~133^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2ab402707ff0ebe4b7b87ef0ffb3233e791cb92f;p=matthieu%2Ffrr.git

lib: move command_parse_format prototype

The function prototype for command_parse_format() is better left in
command.h, so that the bison-generated header file doesn't need to be
included for that.

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

diff --git a/lib/command.c b/lib/command.c
index 8e935acf92..3ad0ca92d7 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -39,7 +39,6 @@
 #include "workqueue.h"
 #include "vrf.h"
 #include "command_match.h"
-#include "command_parse.h"
 #include "qobj.h"
 
 DEFINE_MTYPE(       LIB, HOST,       "Host config")
diff --git a/lib/command.h b/lib/command.h
index a38f436884..c9b3440b02 100644
--- a/lib/command.h
+++ b/lib/command.h
@@ -431,6 +431,8 @@ del_cmd_token (struct cmd_token *);
 struct cmd_token *
 copy_cmd_token (struct cmd_token *);
 
+extern void command_parse_format (struct graph *graph, struct cmd_element *cmd);
+
 /* Export typical functions. */
 extern const char *host_config_get (void);
 extern void host_config_set (const char *);
diff --git a/lib/command_match.c b/lib/command_match.c
index 93f898da7b..d4996f634d 100644
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -25,7 +25,6 @@
 #include <zebra.h>
 
 #include "command_match.h"
-#include "command_parse.h"
 #include "memory.h"
 
 DEFINE_MTYPE_STATIC(LIB, CMD_TOKENS, "Command Tokens")
diff --git a/lib/command_parse.y b/lib/command_parse.y
index e381507cc3..ac8e060113 100644
--- a/lib/command_parse.y
+++ b/lib/command_parse.y
@@ -51,8 +51,6 @@
 
 /* functionality this unit exports */
 %code provides {
-  void
-  command_parse_format (struct graph *, struct cmd_element *);
 
   /* maximum length of a number, lexer will not match anything longer */
   #define DECIMAL_STRLEN_MAX 20
diff --git a/tools/permutations.c b/tools/permutations.c
index 49f9416b21..8db51ee037 100644
--- a/tools/permutations.c
+++ b/tools/permutations.c
@@ -23,7 +23,6 @@
 
 #include "command.h"
 #include "graph.h"
-#include "command_parse.h"
 #include "vector.h"
 
 #define USAGE "usage: permutations <cmdstr>"