builtin.h: Move two functions definitions to help.h.

The two functions defined here are implemented in help.c, so makes more sense
to put the definition of those in help.h instead of in builtin.h.

Signed-off-by: Thiago Farina <tfransosi@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin.h b/builtin.h
index ed6ee26933430e1db4e29e62badfaf0b217935ad..0398d247400e55f2a2ededc054902374c7516d5b 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -11,8 +11,6 @@ extern const char git_version_string[];
 extern const char git_usage_string[];
 extern const char git_more_info_string[];
 
 extern const char git_usage_string[];
 extern const char git_more_info_string[];
 

-extern void list_common_cmds_help(void);
-extern const char *help_unknown_cmd(const char *cmd);

 extern void prune_packed_objects(int);
 extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
        struct strbuf *out);
 extern void prune_packed_objects(int);
 extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
        struct strbuf *out);

diff --git a/git.c b/git.c
index 8de48107e0dced316704c1ad78569ccb9eeebb08..795f75e56d2584b13bc39bcf77779af1ec3bc46c 100644 (file)
--- a/git.c
+++ b/git.c
@@ -1,6 +1,7 @@
 #include "builtin.h"
 #include "builtin.h"

-#include "exec_cmd.h"

 #include "cache.h"
 #include "cache.h"

+#include "exec_cmd.h"
+#include "help.h"

 #include "quote.h"
 #include "run-command.h"
 
 #include "quote.h"
 #include "run-command.h"
 

diff --git a/help.h b/help.h
index 56bc15406ffc55115fa1c827e0d1d5a7e74c516d..b6b12d5754888438085bb4e574b034951ffec473 100644 (file)
--- a/help.h
+++ b/help.h
@@ -16,14 +16,17 @@ static inline void mput_char(char c, unsigned int num)
                putchar(c);
 }
 
                putchar(c);
 }
 

-void load_command_list(const char *prefix,
-               struct cmdnames *main_cmds,
-               struct cmdnames *other_cmds);
-void add_cmdname(struct cmdnames *cmds, const char *name, int len);
+extern void list_common_cmds_help(void);
+extern const char *help_unknown_cmd(const char *cmd);
+extern void load_command_list(const char *prefix,
+                             struct cmdnames *main_cmds,
+                             struct cmdnames *other_cmds);
+extern void add_cmdname(struct cmdnames *cmds, const char *name, int len);

 /* Here we require that excludes is a sorted list. */
 /* Here we require that excludes is a sorted list. */

-void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
-int is_in_cmdlist(struct cmdnames *c, const char *s);
-void list_commands(const char *title, struct cmdnames *main_cmds,
-                  struct cmdnames *other_cmds);
+extern void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
+extern int is_in_cmdlist(struct cmdnames *cmds, const char *name);
+extern void list_commands(const char *title,
+                         struct cmdnames *main_cmds,
+                         struct cmdnames *other_cmds);

 
 #endif /* HELP_H */
 
 #endif /* HELP_H */