New upstream version 1.4.3+dfsg.1

[libgit2.git] / src / trace.h

diff --git a/src/trace.h b/src/trace.h
index a233aa2257c3518f98c7eac699a3b644eb5b4efc..239928dcbce69cfc94e3667d34698acd1c084232 100644 (file)
--- a/src/trace.h
+++ b/src/trace.h
@@ -10,9 +10,7 @@
 #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;
@@ -27,13 +25,13 @@ GIT_INLINE(void) git_trace__write_fmt(
        va_list ap)
 {
        git_trace_cb callback = git_trace__data.callback;
-       git_buf message = GIT_BUF_INIT;
+       git_str message = GIT_STR_INIT;
 
-       git_buf_vprintf(&message, fmt, ap);
+       git_str_vprintf(&message, fmt, ap);
 
-       callback(level, git_buf_cstr(&message));
+       callback(level, git_str_cstr(&message));
 
-       git_buf_dispose(&message);
+       git_str_dispose(&message);
 }
 
 #define git_trace_level()      (git_trace__data.level)
@@ -50,19 +48,4 @@ GIT_INLINE(void) git_trace(git_trace_level_t level, const char *fmt, ...)
        }
 }
 
-#else
-
-GIT_INLINE(void) git_trace__null(
-       git_trace_level_t level,
-       const char *fmt, ...)
-{
-       GIT_UNUSED(level);
-       GIT_UNUSED(fmt);
-}
-
-#define git_trace_level()      ((git_trace_level_t)0)
-#define git_trace              git_trace__null
-
-#endif
-
 #endif