From 66f66c596fa2b4e7d4c00575a5731d33ab28d4ed Mon Sep 17 00:00:00 2001 From: Karsten Blees Date: Sat, 12 Jul 2014 02:04:29 +0200 Subject: trace: move code around, in preparation to file:line output No functional changes, just move stuff around so that the next patch isn't that ugly... Signed-off-by: Karsten Blees Signed-off-by: Junio C Hamano --- trace.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'trace.c') diff --git a/trace.c b/trace.c index 18e5d93c1f..e8ce619696 100644 --- a/trace.c +++ b/trace.c @@ -132,20 +132,20 @@ static void trace_vprintf(struct trace_key *key, const char *format, va_list ap) print_trace_line(key, &buf); } -void trace_printf_key(struct trace_key *key, const char *format, ...) +void trace_argv_printf(const char **argv, const char *format, ...) { + struct strbuf buf = STRBUF_INIT; va_list ap; - va_start(ap, format); - trace_vprintf(key, format, ap); - va_end(ap); -} -void trace_printf(const char *format, ...) -{ - va_list ap; + if (!prepare_trace_line(NULL, &buf)) + return; + va_start(ap, format); - trace_vprintf(NULL, format, ap); + strbuf_vaddf(&buf, format, ap); va_end(ap); + + sq_quote_argv(&buf, argv, 0); + print_trace_line(NULL, &buf); } void trace_strbuf(struct trace_key *key, const struct strbuf *data) @@ -159,20 +159,20 @@ void trace_strbuf(struct trace_key *key, const struct strbuf *data) print_trace_line(key, &buf); } -void trace_argv_printf(const char **argv, const char *format, ...) +void trace_printf(const char *format, ...) { - struct strbuf buf = STRBUF_INIT; va_list ap; - - if (!prepare_trace_line(NULL, &buf)) - return; - va_start(ap, format); - strbuf_vaddf(&buf, format, ap); + trace_vprintf(NULL, format, ap); va_end(ap); +} - sq_quote_argv(&buf, argv, 0); - print_trace_line(NULL, &buf); +void trace_printf_key(struct trace_key *key, const char *format, ...) +{ + va_list ap; + va_start(ap, format); + trace_vprintf(key, format, ap); + va_end(ap); } static const char *quote_crnl(const char *path) -- cgit v1.2.3