From: Karsten Blees Date: Wed, 11 Jun 2014 08:00:11 GMT Subject: [PATCH v5 07/11] trace: move code around, in preparation to file:line output Message-ID: <53980C8B.2010207@gmail.com> In-Reply-To: <53980B83.9050409@gmail.com> No functional changes, just move stuff around so that the next patch isn't that ugly... Signed-off-by: Karsten Blees --- trace.c | 36 ++++++++++++++++++------------------ trace.h | 12 ++++++++---- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/trace.c b/trace.c index 5a3393a..c86d33c 100644 --- a/trace.c +++ b/trace.c @@ -119,20 +119,20 @@ static void trace_vprintf(const char *key, const char *format, va_list ap) print_trace_line(key, &buf); } -void trace_printf_key(const char *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("GIT_TRACE", &buf)) + return; + va_start(ap, format); - trace_vprintf("GIT_TRACE", format, ap); + strbuf_vaddf(&buf, format, ap); va_end(ap); + + sq_quote_argv(&buf, argv, 0); + print_trace_line("GIT_TRACE", &buf); } void trace_strbuf(const char *key, const struct strbuf *data) @@ -146,20 +146,20 @@ void trace_strbuf(const char *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("GIT_TRACE", &buf)) - return; - va_start(ap, format); - strbuf_vaddf(&buf, format, ap); + trace_vprintf("GIT_TRACE", format, ap); va_end(ap); +} - sq_quote_argv(&buf, argv, 0); - print_trace_line("GIT_TRACE", &buf); +void trace_printf_key(const char *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) diff --git a/trace.h b/trace.h index e03db2f..5c7f2dc 100644 --- a/trace.h +++ b/trace.h @@ -4,14 +4,18 @@ #include "git-compat-util.h" #include "strbuf.h" -__attribute__((format (printf, 1, 2))) -extern void trace_printf(const char *format, ...); -__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 int trace_want(const char *key); + +__attribute__((format (printf, 1, 2))) +extern void trace_printf(const char *format, ...); + __attribute__((format (printf, 2, 3))) extern void trace_printf_key(const char *key, const char *format, ...); + +__attribute__((format (printf, 2, 3))) +extern void trace_argv_printf(const char **argv, const char *format, ...); + extern void trace_strbuf(const char *key, const struct strbuf *data); #endif /* TRACE_H */ -- 1.9.2.msysgit.0.501.gaeecf09 -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "msysGit" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.