[PATCH v2 1/3] Use startup_info->prefix rather than prefix.
- From
Jared Hance <jaredhance@gmail.com>
- Date
- Mar 3, 2012, 14:40 UTC
- Message-ID
- <606ef5a298db20ca54dc9a53f0e1541e94aafe57.1330785363.git.jaredhance@gmail.com>
- In-Reply-To
- <cover.1330740964.git.jaredhance@gmail.com>
In trace_repo_setup, prefix is passed in as startup_info->prefix. But, as indicated but a FIXME comment, trace_repo_setup has access to startup_info. The prefix parameter has therefor been eliminated.
Signed-off-by: Jared Hance <jaredhance@gmail.com> --- cache.h | 2 +- git.c | 2 +- trace.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cache.h b/cache.h index e12b15f..baa8852 100644 --- a/cache.h +++ b/cache.h @@ -1211,7 +1211,7 @@ extern void trace_printf(const char *format, ...); extern void trace_vprintf(const char *key, const char *format, va_list ap); __attribute__((format (printf, 2, 3))) extern void trace_argv_printf(const char **argv, const char *format, ...); -extern void trace_repo_setup(const char *prefix); +extern void trace_repo_setup(void); extern int trace_want(const char *key); extern void trace_strbuf(const char *key, const struct strbuf *buf); diff --git a/git.c b/git.c index 3805616..7dcc527 100644 --- a/git.c +++ b/git.c @@ -296,7 +296,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv) if ((p->option & (RUN_SETUP | RUN_SETUP_GENTLY)) && startup_info->have_repository) /* get_git_dir() may set up repo, avoid that */ - trace_repo_setup(prefix); + trace_repo_setup(); } commit_pager_choice(); diff --git a/trace.c b/trace.c index d953416..09a470b 100644 --- a/trace.c +++ b/trace.c @@ -152,8 +152,7 @@ static const char *quote_crnl(const char *path) return new_path; } -/* 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) { static const char *key = "GIT_TRACE_SETUP"; const char *git_work_tree; @@ -168,13 +167,14 @@ void trace_repo_setup(const char *prefix) if (!(git_work_tree = get_git_work_tree())) git_work_tree = "(null)"; - if (!prefix) - prefix = "(null)"; + if (!startup_info->prefix) + startup_info->prefix = "(null)"; trace_printf_key(key, "setup: git_dir: %s\n", quote_crnl(get_git_dir())); trace_printf_key(key, "setup: worktree: %s\n", quote_crnl(git_work_tree)); trace_printf_key(key, "setup: cwd: %s\n", quote_crnl(cwd)); - trace_printf_key(key, "setup: prefix: %s\n", quote_crnl(prefix)); + trace_printf_key(key, "setup: prefix: %s\n", + quote_crnl(startup_info->prefix)); } int trace_want(const char *key)
-- 1.7.3.4