Commit 94b3b374 authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

trace: add trace_strbuf

If you happen to have a strbuf, it is a little more readable
and a little more efficient to be able to print it directly
instead of jamming it through the trace_printf interface.
Signed-off-by: default avatarJeff King <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 39bc5e46
......@@ -1072,6 +1072,7 @@ __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);
extern void trace_strbuf(const char *key, const struct strbuf *buf);
/* convert.c */
/* returns 1 if *dst was used */
......
......@@ -65,19 +65,14 @@ static const char err_msg[] = "Could not trace into fd given by "
void trace_vprintf(const char *key, const char *fmt, va_list ap)
{
struct strbuf buf = STRBUF_INIT;
int fd, need_close = 0;
fd = get_trace_fd(key, &need_close);
if (!fd)
if (!trace_want(key))
return;
set_try_to_free_routine(NULL); /* is never reset */
strbuf_vaddf(&buf, fmt, ap);
write_or_whine_pipe(fd, buf.buf, buf.len, err_msg);
trace_strbuf(key, &buf);
strbuf_release(&buf);
if (need_close)
close(fd);
}
void trace_printf_key(const char *key, const char *fmt, ...)
......@@ -96,6 +91,20 @@ void trace_printf(const char *fmt, ...)
va_end(ap);
}
void trace_strbuf(const char *key, const struct strbuf *buf)
{
int fd, need_close = 0;
fd = get_trace_fd(key, &need_close);
if (!fd)
return;
write_or_whine_pipe(fd, buf->buf, buf->len, err_msg);
if (need_close)
close(fd);
}
void trace_argv_printf(const char **argv, const char *fmt, ...)
{
struct strbuf buf = STRBUF_INIT;
......
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