Commit 66f66c59 authored by Karsten Blees's avatar Karsten Blees Committed by Junio C Hamano

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: default avatarKarsten Blees <blees@dcon.de>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent b72be02c
......@@ -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)
......
......@@ -13,15 +13,19 @@ struct trace_key {
#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
__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(struct trace_key *key);
extern void trace_disable(struct trace_key *key);
__attribute__((format (printf, 1, 2)))
extern void trace_printf(const char *format, ...);
__attribute__((format (printf, 2, 3)))
extern void trace_printf_key(struct trace_key *key, const char *format, ...);
__attribute__((format (printf, 2, 3)))
extern void trace_argv_printf(const char **argv, const char *format, ...);
extern void trace_strbuf(struct trace_key *key, const struct strbuf *data);
#endif /* TRACE_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment