No functional changes, just move stuff around so that the next patch isn't
that ugly...
Signed-off-by: Karsten Blees <blees@xxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
trace.c | 36 ++++++++++++++++++------------------
trace.h | 12 ++++++++----
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/trace.c b/trace.c
index 9fa6cc7..869fb7b 100644
--- a/trace.c
+++ b/trace.c
@@ -127,20 +127,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)
@@ -154,20 +154,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 */
--
2.0.0.402.g13b8b25
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html