From: Johannes Sixt Date: Wed, 11 Apr 2007 13:26:08 +0000 (+0200) Subject: Turn builtin_exec_path into a function. X-Git-Tag: v1.6.0-rc0~159^2~9 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4ec22a48c0575c8a303cd00b5ef4b3d703fbf8b3;p=git.git Turn builtin_exec_path into a function. builtin_exec_path returns the hard-coded installation path, which is used as the ultimate fallback to look for git commands. Making it into a function enables us in a follow-up patch to return a computed value instead of just a constant string. Signed-off-by: Johannes Sixt --- diff --git a/exec_cmd.c b/exec_cmd.c index a1bc4e04b..6618aad7a 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -4,9 +4,13 @@ #define MAX_ARGS 32 extern char **environ; -static const char *builtin_exec_path = GIT_EXEC_PATH; static const char *argv_exec_path; +static const char *builtin_exec_path(void) +{ + return GIT_EXEC_PATH; +} + void git_set_argv_exec_path(const char *exec_path) { argv_exec_path = exec_path; @@ -26,7 +30,7 @@ const char *git_exec_path(void) return env; } - return builtin_exec_path; + return builtin_exec_path(); } static void add_path(struct strbuf *out, const char *path) @@ -50,7 +54,7 @@ void setup_path(const char *cmd_path) add_path(&new_path, argv_exec_path); add_path(&new_path, getenv(EXEC_PATH_ENVIRONMENT)); - add_path(&new_path, builtin_exec_path); + add_path(&new_path, builtin_exec_path()); add_path(&new_path, cmd_path); if (old_path)