trace: add trace_vprintf

This is a necessary cleanup to adding new types of trace
functions.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 4a758babec4b53bf8b98572128c5bbf11019beb3..08b23b2ab96c1c20f90fbb03ad4d155b9a53bf88 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1067,6 +1067,7 @@ extern void alloc_report(void);
 /* trace.c */
 __attribute__((format (printf, 1, 2)))
 extern void trace_printf(const char *format, ...);
 /* trace.c */
 __attribute__((format (printf, 1, 2)))
 extern void trace_printf(const char *format, ...);

+extern void trace_vprintf(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);
 __attribute__((format (printf, 2, 3)))
 extern void trace_argv_printf(const char **argv, const char *format, ...);
 extern void trace_repo_setup(const char *prefix);

diff --git a/trace.c b/trace.c
index eda3f6d721dc3c70a858eaa247a3100111324fb4..623e793e4f4a959252347c643c77747b04c80543 100644 (file)
--- a/trace.c
+++ b/trace.c
@@ -62,10 +62,9 @@ static int get_trace_fd(int *need_close)
 static const char err_msg[] = "Could not trace into fd given by "
        "GIT_TRACE environment variable";
 
 static const char err_msg[] = "Could not trace into fd given by "
        "GIT_TRACE environment variable";
 

-void trace_printf(const char *fmt, ...)
+void trace_vprintf(const char *fmt, va_list ap)

 {
        struct strbuf buf = STRBUF_INIT;
 {
        struct strbuf buf = STRBUF_INIT;

-       va_list ap;

        int fd, need_close = 0;
 
        fd = get_trace_fd(&need_close);
        int fd, need_close = 0;
 
        fd = get_trace_fd(&need_close);


@@ -73,10 +72,7 @@ void trace_printf(const char *fmt, ...)
                return;
 
        set_try_to_free_routine(NULL);  /* is never reset */
                return;
 
        set_try_to_free_routine(NULL);  /* is never reset */

-       va_start(ap, fmt);

        strbuf_vaddf(&buf, fmt, ap);
        strbuf_vaddf(&buf, fmt, ap);

-       va_end(ap);
-

        write_or_whine_pipe(fd, buf.buf, buf.len, err_msg);
        strbuf_release(&buf);
 
        write_or_whine_pipe(fd, buf.buf, buf.len, err_msg);
        strbuf_release(&buf);
 


@@ -84,6 +80,14 @@ void trace_printf(const char *fmt, ...)
                close(fd);
 }
 
                close(fd);
 }
 

+void trace_printf(const char *fmt, ...)
+{
+       va_list ap;
+       va_start(ap, fmt);
+       trace_vprintf(fmt, ap);
+       va_end(ap);
+}
+

 void trace_argv_printf(const char **argv, const char *fmt, ...)
 {
        struct strbuf buf = STRBUF_INIT;
 void trace_argv_printf(const char **argv, const char *fmt, ...)
 {
        struct strbuf buf = STRBUF_INIT;