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 8e935acf92fa34dad0d9f5c31085b1058b3bc2c0..3ad0ca92d7f87e1bff19db75cac3bfabcd7ffa25 100644 (file)
--- 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 a38f4368840f88a6976e65a4ebbf66ce4960227c..c9b3440b029f8f8181e62c68ef90a29cce42762e 100644 (file)
--- 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 93f898da7bc8f73ccd9246dcec2e42a5b611d75f..d4996f634d0cf2f1e2f2a219fecd3b80e0f01268 100644 (file)
--- 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 e381507cc316ceeae3a0c5ef6a6804b8873e0f33..ac8e0601132509b6fee11f7418d0e8bc8b6b3dcf 100644 (file)
--- 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 49f9416b21c2614ed4d51b11fd1d9759e2060c27..8db51ee0374d8d1a59a1003a5f662d260345c6e6 100644 (file)
--- 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>"