git-tag.txt: list all modes in the description

[thirdparty/git.git] / trace.c

diff --git a/trace.c b/trace.c
index bdb5d2fa77ed06bd5ea3ef33b827a6bd11618268..35d388dce44a4a8e3d6053dfd6abcb652771818a 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -25,10 +25,6 @@
 #include "cache.h"
 #include "quote.h"
 
-void do_nothing(size_t unused)
-{
-}
-
 /* Get a trace file descriptor from GIT_TRACE env variable. */
 static int get_trace_fd(int *need_close)
 {
@@ -76,7 +72,7 @@ void trace_printf(const char *fmt, ...)
        if (!fd)
                return;
 
-       set_try_to_free_routine(do_nothing);    /* is never reset */
+       set_try_to_free_routine(NULL);  /* is never reset */
        strbuf_init(&buf, 64);
        va_start(ap, fmt);
        len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
@@ -108,7 +104,7 @@ void trace_argv_printf(const char **argv, const char *fmt, ...)
        if (!fd)
                return;
 
-       set_try_to_free_routine(do_nothing);    /* is never reset */
+       set_try_to_free_routine(NULL);  /* is never reset */
        strbuf_init(&buf, 64);
        va_start(ap, fmt);
        len = vsnprintf(buf.buf, strbuf_avail(&buf), fmt, ap);
@@ -158,6 +154,7 @@ static const char *quote_crnl(const char *path)
 /* FIXME: move prefix to startup_info struct and get rid of this arg */
 void trace_repo_setup(const char *prefix)
 {
+       const char *git_work_tree;
        char cwd[PATH_MAX];
        char *trace = getenv("GIT_TRACE");
 
@@ -168,8 +165,14 @@ void trace_repo_setup(const char *prefix)
        if (!getcwd(cwd, PATH_MAX))
                die("Unable to get current working directory");
 
+       if (!(git_work_tree = get_git_work_tree()))
+               git_work_tree = "(null)";
+
+       if (!prefix)
+               prefix = "(null)";
+
        trace_printf("setup: git_dir: %s\n", quote_crnl(get_git_dir()));
-       trace_printf("setup: worktree: %s\n", quote_crnl(get_git_work_tree()));
+       trace_printf("setup: worktree: %s\n", quote_crnl(git_work_tree));
        trace_printf("setup: cwd: %s\n", quote_crnl(cwd));
        trace_printf("setup: prefix: %s\n", quote_crnl(prefix));
 }