aboutsummaryrefslogtreecommitdiff
path: root/trace.c
diff options
context:
space:
mode:
authorKarsten Blees <karsten.blees@gmail.com>2014-07-12 02:04:29 +0200
committerJunio C Hamano <gitster@pobox.com>2014-07-13 21:25:19 -0700
commit66f66c596fa2b4e7d4c00575a5731d33ab28d4ed (patch)
tree4819b72e374af4713bdc1577c8213f1dc743bc24 /trace.c
parentb72be02cfb402bbd6abac07af7231613cd37d594 (diff)
downloadgit-66f66c596fa2b4e7d4c00575a5731d33ab28d4ed.tar.gz
git-66f66c596fa2b4e7d4c00575a5731d33ab28d4ed.tar.xz
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 <blees@dcon.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'trace.c')
-rw-r--r--trace.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/trace.c b/trace.c
index 18e5d93c1..e8ce61969 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)