trace.c, git.c: remove unnecessary parameter to trace_repo_setup()

trace_repo_setup() of trace.c is called with the argument 'prefix' from
only one location, run_builtin of git.c, which sets 'prefix' to the return
value of setup_git_directory() or setup_git_directory_gently() (a wrapper
of the former).

Now that "prefix" is in startup_info there is no need for the parameter
of trace_repo_setup() because setup_git_directory() sets "startup_info->prefix"
to the same value it returns. It would be less confusing to use "prefix"
from startup_info instead of passing it as an argument.

Signed-off-by: Idriss Fekir <mcsm224@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git.c b/git.c
index 96b0a2837dcd69d875181fe6b9f395f1703c4583..6171fd6769d715df1ce232bcac6d2465eca847dd 100644 (file)
--- a/git.c
+++ b/git.c
@@ -430,7 +430,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
                use_pager = 1;
        if (run_setup && startup_info->have_repository)
                /* get_git_dir() may set up repo, avoid that */
-               trace_repo_setup(prefix);
+               trace_repo_setup();
        commit_pager_choice();
 
        if (!help && p->option & NEED_WORK_TREE)

diff --git a/trace.c b/trace.c
index 794a087c21e100e147665181a592bc811b3c1265..efa4e2d8e08fcbcd3bf3dfa7c8364a7c06def5e4 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -291,10 +291,9 @@ static const char *quote_crnl(const char *path)
        return new_path.buf;
 }
 
-/* FIXME: move prefix to startup_info struct and get rid of this arg */
-void trace_repo_setup(const char *prefix)
+void trace_repo_setup(void)
 {
-       const char *git_work_tree;
+       const char *git_work_tree, *prefix = startup_info->prefix;
        char *cwd;
 
        if (!trace_want(&trace_setup_key))
@@ -305,7 +304,7 @@ void trace_repo_setup(const char *prefix)
        if (!(git_work_tree = get_git_work_tree()))
                git_work_tree = "(null)";
 
-       if (!prefix)
+       if (!startup_info->prefix)
                prefix = "(null)";
 
        trace_printf_key(&trace_setup_key, "setup: git_dir: %s\n", quote_crnl(get_git_dir()));

diff --git a/trace.h b/trace.h
index 4e771f86ac289ada2f5b97eb4013ef313fbb3cbf..b6e35b947005ff1aa57b27648653f51a0b3b2fec 100644 (file)
--- a/trace.h
+++ b/trace.h
@@ -93,7 +93,7 @@ extern struct trace_key trace_default_key;
 extern struct trace_key trace_perf_key;
 extern struct trace_key trace_setup_key;
 
-void trace_repo_setup(const char *prefix);
+void trace_repo_setup(void);
 
 /**
  * Checks whether the trace key is enabled. Used to prevent expensive