Remove old and unused error codes

4 files changed, 22 insertions, 39 deletions

diff --git a/tests-clar/clar_libgit2.h b/tests-clar/clar_libgit2.h
index 4d338efca..63bc703d7 100644
--- a/tests-clar/clar_libgit2.h
+++ b/tests-clar/clar_libgit2.h
@@ -13,9 +13,9 @@
  * return error codes!
  */
 #define cl_git_pass(expr) do { \
-	git_clearerror(); \
-	if ((expr) != GIT_SUCCESS) \
-		clar__assert(0, __FILE__, __LINE__, "Function call failed: " #expr, git_lasterror(), 1); \
+	giterr_clear(); \
+	if ((expr) != 0) \
+		clar__assert(0, __FILE__, __LINE__, "Function call failed: " #expr, giterr_last()->message, 1); \
 	} while(0)
 
 /**
diff --git a/tests-clar/core/errors.c b/tests-clar/core/errors.c
index 78f811c71..0be3e7aca 100644
--- a/tests-clar/core/errors.c
+++ b/tests-clar/core/errors.c
@@ -3,46 +3,30 @@
 #include "util.h"
 #include "posix.h"
 
-#ifdef git__throw
-void test_core_errors__old_school(void)
-{
-	git_clearerror();
-	cl_assert(git_lasterror() == NULL);
-
-	cl_assert(git_strerror(GIT_ENOTFOUND) != NULL);
-
-	git__throw(GIT_ENOTFOUND, "My Message");
-	cl_assert(git_lasterror() != NULL);
-	cl_assert(git__prefixcmp(git_lasterror(), "My Message") == 0);
-	git_clearerror();
-}
-#endif
-
-#ifdef GITERR_CHECK_ALLOC
 void test_core_errors__new_school(void)
 {
 	char *str_in_error;
 
-	git_error_clear();
-	cl_assert(git_error_last() == NULL);
+	giterr_clear();
+	cl_assert(giterr_last() == NULL);
 
 	giterr_set_oom(); /* internal fn */
 
-	cl_assert(git_error_last() != NULL);
-	cl_assert(git_error_last()->klass == GITERR_NOMEMORY);
-	str_in_error = strstr(git_error_last()->message, "memory");
+	cl_assert(giterr_last() != NULL);
+	cl_assert(giterr_last()->klass == GITERR_NOMEMORY);
+	str_in_error = strstr(giterr_last()->message, "memory");
 	cl_assert(str_in_error != NULL);
 
-	git_error_clear();
+	giterr_clear();
 
 	giterr_set(GITERR_REPOSITORY, "This is a test"); /* internal fn */
 
-	cl_assert(git_error_last() != NULL);
-	str_in_error = strstr(git_error_last()->message, "This is a test");
+	cl_assert(giterr_last() != NULL);
+	str_in_error = strstr(giterr_last()->message, "This is a test");
 	cl_assert(str_in_error != NULL);
 
-	git_error_clear();
-	cl_assert(git_error_last() == NULL);
+	giterr_clear();
+	cl_assert(giterr_last() == NULL);
 
 	do {
 		struct stat st;
@@ -52,26 +36,25 @@ void test_core_errors__new_school(void)
 	} while (false);
 	giterr_set(GITERR_OS, "stat failed"); /* internal fn */
 
-	cl_assert(git_error_last() != NULL);
-	str_in_error = strstr(git_error_last()->message, "stat failed");
+	cl_assert(giterr_last() != NULL);
+	str_in_error = strstr(giterr_last()->message, "stat failed");
 	cl_assert(str_in_error != NULL);
 	cl_assert(git__prefixcmp(str_in_error, "stat failed: ") == 0);
 	cl_assert(strlen(str_in_error) > strlen("stat failed: "));
 
 #ifdef GIT_WIN32
-	git_error_clear();
+	giterr_clear();
 
 	/* The MSDN docs use this to generate a sample error */
 	cl_assert(GetProcessId(NULL) == 0);
 	giterr_set(GITERR_OS, "GetProcessId failed"); /* internal fn */
 
-	cl_assert(git_error_last() != NULL);
-	str_in_error = strstr(git_error_last()->message, "GetProcessId failed");
+	cl_assert(giterr_last() != NULL);
+	str_in_error = strstr(giterr_last()->message, "GetProcessId failed");
 	cl_assert(str_in_error != NULL);
 	cl_assert(git__prefixcmp(str_in_error, "GetProcessId failed: ") == 0);
 	cl_assert(strlen(str_in_error) > strlen("GetProcessId failed: "));
 #endif
 
-	git_error_clear();
+	giterr_clear();
 }
-#endif
diff --git a/tests-clar/network/remotes.c b/tests-clar/network/remotes.c
index 9d414c914..766a461b9 100644
--- a/tests-clar/network/remotes.c
+++ b/tests-clar/network/remotes.c
@@ -101,8 +101,8 @@ void test_network_remotes__save(void)
 
 void test_network_remotes__fnmatch(void)
 {
-	cl_git_pass(git_refspec_src_match(_refspec, "refs/heads/master"));
-	cl_git_pass(git_refspec_src_match(_refspec, "refs/heads/multi/level/branch"));
+	cl_assert(git_refspec_src_matches(_refspec, "refs/heads/master"));
+	cl_assert(git_refspec_src_matches(_refspec, "refs/heads/multi/level/branch"));
 }
 
 void test_network_remotes__transform(void)
diff --git a/tests-clar/object/tree/frompath.c b/tests-clar/object/tree/frompath.c
index d4075c0b4..ea0add37b 100644
--- a/tests-clar/object/tree/frompath.c
+++ b/tests-clar/object/tree/frompath.c
@@ -43,7 +43,7 @@ static void assert_tree_from_path(git_tree *root, const char *path, int expected
 static void assert_tree_from_path_klass(git_tree *root, const char *path, int expected_result, const char *expected_raw_oid)
 {
 	assert_tree_from_path(root, path, GIT_ERROR, expected_raw_oid);
-	cl_assert(git_error_last()->klass == expected_result);
+	cl_assert(giterr_last()->klass == expected_result);
 }
 
 void test_object_tree_frompath__retrieve_tree_from_path_to_treeentry(void)