No functional changes, just move stuff around so that the next patch isn't
that ugly...
Signed-off-by: Karsten Blees <blees@xxxxxxx>
---
trace.c | 36 ++++++++++++++++++------------------
trace.h | 12 ++++++++----
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/trace.c b/trace.c
index 18e5d93..e8ce619 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)
diff --git a/trace.h b/trace.h
index e69455f..0c98da2 100644
--- a/trace.h
+++ b/trace.h
@@ -13,15 +13,19 @@ struct trace_key {
#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name }
-__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 */
--
2.0.0.406.ge74f8ff
--
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