Thiago FarinaThe 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> --- builtin.h | 2 -- git.c | 3 ++- help.h | 19 +++++++++++-------- 3 files changed, 13 insertions(+), 11 deletions(-)
Show changes to 3 files +13 −11
builtin.h, git.c, help.h
diff --git a/builtin.h b/builtin.h index ed6ee26..0398d24 100644 --- 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 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); diff --git a/git.c b/git.c index 12d2952..05d4156 100644 --- a/git.c +++ b/git.c @@ -1,6 +1,7 @@ #include "builtin.h" -#include "exec_cmd.h" #include "cache.h" +#include "exec_cmd.h" +#include "help.h" #include "quote.h" #include "run-command.h" diff --git a/help.h b/help.h index 56bc154..208af70 100644 --- a/help.h +++ b/help.h @@ -16,14 +16,17 @@ static inline void mput_char(char c, unsigned int num) 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. */ -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 */
-- 1.7.2.1.95.g3d045