New upstream version 1.3.0+dfsg.1

[libgit2.git] / src / trace.c

diff --git a/src/trace.c b/src/trace.c
index 0f21428619a2b445beaf7a8bec53fc14bc232a91..efc7b01a2d8d0f0891abd302ee6de9f0af1e2ebd 100644 (file)
--- a/src/trace.c
+++ b/src/trace.c
@@ -5,10 +5,10 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#include "buffer.h"
-#include "common.h"
-#include "global.h"
 #include "trace.h"
+
+#include "buffer.h"
+#include "runtime.h"
 #include "git2/trace.h"
 
 #ifdef GIT_TRACE
@@ -17,10 +17,10 @@ struct git_trace_data git_trace__data = {0};
 
 #endif
 
-int git_trace_set(git_trace_level_t level, git_trace_callback callback)
+int git_trace_set(git_trace_level_t level, git_trace_cb callback)
 {
 #ifdef GIT_TRACE
-       assert(level == 0 || callback != NULL);
+       GIT_ASSERT_ARG(level == 0 || callback != NULL);
 
        git_trace__data.level = level;
        git_trace__data.callback = callback;
@@ -31,7 +31,7 @@ int git_trace_set(git_trace_level_t level, git_trace_callback callback)
        GIT_UNUSED(level);
        GIT_UNUSED(callback);
 
-       giterr_set(GITERR_INVALID,
+       git_error_set(GIT_ERROR_INVALID,
                "this version of libgit2 was not built with tracing.");
        return -1;
 #endif