#ifndef INCLUDE_trace_h__
#define INCLUDE_trace_h__
-#include <stdarg.h>
+#include "common.h"
#include <git2/trace.h>
-#include "buffer.h"
-
-#ifdef GIT_TRACE
+#include "str.h"
struct git_trace_data {
git_trace_level_t level;
- git_trace_callback callback;
+ git_trace_cb callback;
};
extern struct git_trace_data git_trace__data;
GIT_INLINE(void) git_trace__write_fmt(
git_trace_level_t level,
- const char *fmt, ...)
+ const char *fmt,
+ va_list ap)
{
- git_trace_callback callback = git_trace__data.callback;
- git_buf message = GIT_BUF_INIT;
- va_list ap;
-
- va_start(ap, fmt);
- git_buf_vprintf(&message, fmt, ap);
- va_end(ap);
-
- callback(level, git_buf_cstr(&message));
-
- git_buf_free(&message);
-}
+ git_trace_cb callback = git_trace__data.callback;
+ git_str message = GIT_STR_INIT;
-#define git_trace_level() (git_trace__data.level)
-#define git_trace(l, ...) { \
- if (git_trace__data.level >= l && \
- git_trace__data.callback != NULL) { \
- git_trace__write_fmt(l, __VA_ARGS__); \
- } \
- }
+ git_str_vprintf(&message, fmt, ap);
-#else
+ callback(level, git_str_cstr(&message));
-#define git_trace_level() ((void)0)
-#define git_trace(lvl, ...) ((void)0)
+ git_str_dispose(&message);
+}
-#endif
+#define git_trace_level() (git_trace__data.level)
+
+GIT_INLINE(void) git_trace(git_trace_level_t level, const char *fmt, ...)
+{
+ if (git_trace__data.level >= level &&
+ git_trace__data.callback != NULL) {
+ va_list ap;
+
+ va_start(ap, fmt);
+ git_trace__write_fmt(level, fmt, ap);
+ va_end(ap);
+ }
+}
#endif