"current_exec_path" is a misleading name, use "argv_exec_path"

Signed-off-by: Scott R Parish <srp@srparish.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/exec_cmd.c b/exec_cmd.c
index 9b74ed2f42ad9a452f5a1d9ab55d5ca1e1de2594..33b17a6b45699e73a9b58f0ff02135eae913b47d 100644 (file)
--- a/exec_cmd.c
+++ b/exec_cmd.c
@@ -5,11 +5,11 @@
 
 extern char **environ;
 static const char *builtin_exec_path = GIT_EXEC_PATH;
 
 extern char **environ;
 static const char *builtin_exec_path = GIT_EXEC_PATH;

-static const char *current_exec_path;
+static const char *argv_exec_path;

 
 

-void git_set_exec_path(const char *exec_path)
+void git_set_argv_exec_path(const char *exec_path)

 {
 {

-       current_exec_path = exec_path;
+       argv_exec_path = exec_path;

 }
 
 
 }
 
 


@@ -18,8 +18,8 @@ const char *git_exec_path(void)
 {
        const char *env;
 
 {
        const char *env;
 

-       if (current_exec_path)
-               return current_exec_path;
+       if (argv_exec_path)
+               return argv_exec_path;

 
        env = getenv(EXEC_PATH_ENVIRONMENT);
        if (env && *env) {
 
        env = getenv(EXEC_PATH_ENVIRONMENT);
        if (env && *env) {


@@ -34,7 +34,7 @@ int execv_git_cmd(const char **argv)
 {
        char git_command[PATH_MAX + 1];
        int i;
 {
        char git_command[PATH_MAX + 1];
        int i;

-       const char *paths[] = { current_exec_path,
+       const char *paths[] = { argv_exec_path,

                                getenv(EXEC_PATH_ENVIRONMENT),
                                builtin_exec_path };
 
                                getenv(EXEC_PATH_ENVIRONMENT),
                                builtin_exec_path };
 

diff --git a/exec_cmd.h b/exec_cmd.h
index 849a8395a0c03ba2976fe4802eee8150fdec5816..da99287552b5d3eafc495f998a936df81ee3f8b9 100644 (file)
--- a/exec_cmd.h
+++ b/exec_cmd.h
@@ -1,7 +1,7 @@
 #ifndef GIT_EXEC_CMD_H
 #define GIT_EXEC_CMD_H
 
 #ifndef GIT_EXEC_CMD_H
 #define GIT_EXEC_CMD_H
 

-extern void git_set_exec_path(const char *exec_path);
+extern void git_set_argv_exec_path(const char *exec_path);

 extern const char* git_exec_path(void);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
 extern int execl_git_cmd(const char *cmd, ...);
 extern const char* git_exec_path(void);
 extern int execv_git_cmd(const char **argv); /* NULL terminated */
 extern int execl_git_cmd(const char *cmd, ...);

diff --git a/git.c b/git.c
index efed91c4f47bea97db52e931ad6652e2eaac152e..c7cabf5f348118f318d7c3abe55853b576869a98 100644 (file)
--- a/git.c
+++ b/git.c
@@ -51,7 +51,7 @@ static int handle_options(const char*** argv, int* argc, int* envchanged)
                if (!prefixcmp(cmd, "--exec-path")) {
                        cmd += 11;
                        if (*cmd == '=')
                if (!prefixcmp(cmd, "--exec-path")) {
                        cmd += 11;
                        if (*cmd == '=')

-                               git_set_exec_path(cmd + 1);
+                               git_set_argv_exec_path(cmd + 1);

                        else {
                                puts(git_exec_path());
                                exit(0);
                        else {
                                puts(git_exec_path());
                                exit(0);