diff options
author | Jeff King <peff@peff.net> | 2009-01-28 02:33:53 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-28 13:16:30 -0800 |
commit | f172f334fde49ce29d0afa21749bf85463a2db9a (patch) | |
tree | d4316e1e91a0af88b80612a3362b7fe9405057f8 | |
parent | 02322e1619dc537dc48650761f6c9bae883612a7 (diff) | |
download | git-f172f334fde49ce29d0afa21749bf85463a2db9a.tar.gz git-f172f334fde49ce29d0afa21749bf85463a2db9a.tar.xz |
git: s/run_command/run_builtin/
There is a static function called run_command which
conflicts with the library function in run-command.c; this
isn't a problem currently, but prevents including
run-command.h in git.c.
This patch just renames the static function to something
more specific and non-conflicting.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | git.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -219,7 +219,7 @@ struct cmd_struct { int option; }; -static int run_command(struct cmd_struct *p, int argc, const char **argv) +static int run_builtin(struct cmd_struct *p, int argc, const char **argv) { int status; struct stat st; @@ -384,7 +384,7 @@ static void handle_internal_command(int argc, const char **argv) struct cmd_struct *p = commands+i; if (strcmp(p->cmd, cmd)) continue; - exit(run_command(p, argc, argv)); + exit(run_builtin(p, argc, argv)); } } |