Skip to content

Commit

Permalink
builtin.h: Move two functions definitions to help.h.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
tfarina authored and gitster committed Sep 1, 2010
1 parent e3efa9c commit fd5c363
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
2 changes: 0 additions & 2 deletions builtin.h
Expand Up @@ -11,8 +11,6 @@ extern const char git_version_string[];
extern const char git_usage_string[]; extern const char git_usage_string[];
extern const char git_more_info_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 void prune_packed_objects(int);
extern int fmt_merge_msg(int merge_summary, struct strbuf *in, extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
struct strbuf *out); struct strbuf *out);
Expand Down
3 changes: 2 additions & 1 deletion 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 "quote.h"
#include "run-command.h" #include "run-command.h"


Expand Down
19 changes: 11 additions & 8 deletions help.h
Expand Up @@ -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, extern void list_common_cmds_help(void);
struct cmdnames *main_cmds, extern const char *help_unknown_cmd(const char *cmd);
struct cmdnames *other_cmds); extern void load_command_list(const char *prefix,
void add_cmdname(struct cmdnames *cmds, const char *name, int len); 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); extern void exclude_cmds(struct cmdnames *cmds, struct cmdnames *excludes);
int is_in_cmdlist(struct cmdnames *c, const char *s); extern int is_in_cmdlist(struct cmdnames *cmds, const char *name);
void list_commands(const char *title, struct cmdnames *main_cmds, extern void list_commands(const char *title,
struct cmdnames *other_cmds); struct cmdnames *main_cmds,
struct cmdnames *other_cmds);


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

0 comments on commit fd5c363

Please sign in to comment.