git_error: use new names in internal APIs and usage

Move to the `git_error` name in the internal API for error-related
functions.

3 files changed, 80 insertions, 80 deletions

diff --git a/tests/core/errors.c b/tests/core/errors.c
index ab18951a6..386ecdc5f 100644
--- a/tests/core/errors.c
+++ b/tests/core/errors.c
@@ -4,26 +4,26 @@ void test_core_errors__public_api(void)
 {
 	char *str_in_error;
 
-	giterr_clear();
-	cl_assert(giterr_last() == NULL);
+	git_error_clear();
+	cl_assert(git_error_last() == NULL);
 
-	giterr_set_oom();
+	git_error_set_oom();
 
-	cl_assert(giterr_last() != NULL);
-	cl_assert(giterr_last()->klass == GITERR_NOMEMORY);
-	str_in_error = strstr(giterr_last()->message, "memory");
+	cl_assert(git_error_last() != NULL);
+	cl_assert(git_error_last()->klass == GIT_ERROR_NOMEMORY);
+	str_in_error = strstr(git_error_last()->message, "memory");
 	cl_assert(str_in_error != NULL);
 
-	giterr_clear();
+	git_error_clear();
 
-	giterr_set_str(GITERR_REPOSITORY, "This is a test");
+	git_error_set_str(GIT_ERROR_REPOSITORY, "This is a test");
 
-	cl_assert(giterr_last() != NULL);
-	str_in_error = strstr(giterr_last()->message, "This is a test");
+	cl_assert(git_error_last() != NULL);
+	str_in_error = strstr(git_error_last()->message, "This is a test");
 	cl_assert(str_in_error != NULL);
 
-	giterr_clear();
-	cl_assert(giterr_last() == NULL);
+	git_error_clear();
+	cl_assert(git_error_last() == NULL);
 }
 
 #include "common.h"
@@ -34,26 +34,26 @@ void test_core_errors__new_school(void)
 {
 	char *str_in_error;
 
-	giterr_clear();
-	cl_assert(giterr_last() == NULL);
+	git_error_clear();
+	cl_assert(git_error_last() == NULL);
 
-	giterr_set_oom(); /* internal fn */
+	git_error_set_oom(); /* internal fn */
 
-	cl_assert(giterr_last() != NULL);
-	cl_assert(giterr_last()->klass == GITERR_NOMEMORY);
-	str_in_error = strstr(giterr_last()->message, "memory");
+	cl_assert(git_error_last() != NULL);
+	cl_assert(git_error_last()->klass == GIT_ERROR_NOMEMORY);
+	str_in_error = strstr(git_error_last()->message, "memory");
 	cl_assert(str_in_error != NULL);
 
-	giterr_clear();
+	git_error_clear();
 
-	giterr_set(GITERR_REPOSITORY, "This is a test"); /* internal fn */
+	git_error_set(GIT_ERROR_REPOSITORY, "This is a test"); /* internal fn */
 
-	cl_assert(giterr_last() != NULL);
-	str_in_error = strstr(giterr_last()->message, "This is a test");
+	cl_assert(git_error_last() != NULL);
+	str_in_error = strstr(git_error_last()->message, "This is a test");
 	cl_assert(str_in_error != NULL);
 
-	giterr_clear();
-	cl_assert(giterr_last() == NULL);
+	git_error_clear();
+	cl_assert(git_error_last() == NULL);
 
 	do {
 		struct stat st;
@@ -61,74 +61,74 @@ void test_core_errors__new_school(void)
 		cl_assert(p_lstat("this_file_does_not_exist", &st) < 0);
 		GIT_UNUSED(st);
 	} while (false);
-	giterr_set(GITERR_OS, "stat failed"); /* internal fn */
+	git_error_set(GIT_ERROR_OS, "stat failed"); /* internal fn */
 
-	cl_assert(giterr_last() != NULL);
-	str_in_error = strstr(giterr_last()->message, "stat failed");
+	cl_assert(git_error_last() != NULL);
+	str_in_error = strstr(git_error_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
-	giterr_clear();
+	git_error_clear();
 
 	/* The MSDN docs use this to generate a sample error */
 	cl_assert(GetProcessId(NULL) == 0);
-	giterr_set(GITERR_OS, "GetProcessId failed"); /* internal fn */
+	git_error_set(GIT_ERROR_OS, "GetProcessId failed"); /* internal fn */
 
-	cl_assert(giterr_last() != NULL);
-	str_in_error = strstr(giterr_last()->message, "GetProcessId failed");
+	cl_assert(git_error_last() != NULL);
+	str_in_error = strstr(git_error_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
 
-	giterr_clear();
+	git_error_clear();
 }
 
 void test_core_errors__restore(void)
 {
 	git_error_state err_state = {0};
 
-	giterr_clear();
-	cl_assert(giterr_last() == NULL);
+	git_error_clear();
+	cl_assert(git_error_last() == NULL);
 
-	cl_assert_equal_i(0, giterr_state_capture(&err_state, 0));
+	cl_assert_equal_i(0, git_error_state_capture(&err_state, 0));
 
 	memset(&err_state, 0x0, sizeof(git_error_state));
 
-	giterr_set(42, "Foo: %s", "bar");
-	cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1));
+	git_error_set(42, "Foo: %s", "bar");
+	cl_assert_equal_i(-1, git_error_state_capture(&err_state, -1));
 
-	cl_assert(giterr_last() == NULL);
+	cl_assert(git_error_last() == NULL);
 
-	giterr_set(99, "Bar: %s", "foo");
+	git_error_set(99, "Bar: %s", "foo");
 
-	giterr_state_restore(&err_state);
+	git_error_state_restore(&err_state);
 
-	cl_assert_equal_i(42, giterr_last()->klass);
-	cl_assert_equal_s("Foo: bar", giterr_last()->message);
+	cl_assert_equal_i(42, git_error_last()->klass);
+	cl_assert_equal_s("Foo: bar", git_error_last()->message);
 }
 
 void test_core_errors__free_state(void)
 {
 	git_error_state err_state = {0};
 
-	giterr_clear();
+	git_error_clear();
 
-	giterr_set(42, "Foo: %s", "bar");
-	cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1));
+	git_error_set(42, "Foo: %s", "bar");
+	cl_assert_equal_i(-1, git_error_state_capture(&err_state, -1));
 
-	giterr_set(99, "Bar: %s", "foo");
+	git_error_set(99, "Bar: %s", "foo");
 
-	giterr_state_free(&err_state);
+	git_error_state_free(&err_state);
 
-	cl_assert_equal_i(99, giterr_last()->klass);
-	cl_assert_equal_s("Bar: foo", giterr_last()->message);
+	cl_assert_equal_i(99, git_error_last()->klass);
+	cl_assert_equal_s("Bar: foo", git_error_last()->message);
 
-	giterr_state_restore(&err_state);
+	git_error_state_restore(&err_state);
 
-	cl_assert(giterr_last() == NULL);
+	cl_assert(git_error_last() == NULL);
 }
 
 void test_core_errors__restore_oom(void)
@@ -136,30 +136,30 @@ void test_core_errors__restore_oom(void)
 	git_error_state err_state = {0};
 	const git_error *oom_error = NULL;
 
-	giterr_clear();
+	git_error_clear();
 
-	giterr_set_oom(); /* internal fn */
-	oom_error = giterr_last();
+	git_error_set_oom(); /* internal fn */
+	oom_error = git_error_last();
 	cl_assert(oom_error);
 
-	cl_assert_equal_i(-1, giterr_state_capture(&err_state, -1));
+	cl_assert_equal_i(-1, git_error_state_capture(&err_state, -1));
 
-	cl_assert(giterr_last() == NULL);
-	cl_assert_equal_i(GITERR_NOMEMORY, err_state.error_msg.klass);
+	cl_assert(git_error_last() == NULL);
+	cl_assert_equal_i(GIT_ERROR_NOMEMORY, err_state.error_msg.klass);
 	cl_assert_equal_s("Out of memory", err_state.error_msg.message);
 
-	giterr_state_restore(&err_state);
+	git_error_state_restore(&err_state);
 
-	cl_assert(giterr_last()->klass == GITERR_NOMEMORY);
-	cl_assert_(giterr_last() == oom_error, "static oom error not restored");
+	cl_assert(git_error_last()->klass == GIT_ERROR_NOMEMORY);
+	cl_assert_(git_error_last() == oom_error, "static oom error not restored");
 
-	giterr_clear();
+	git_error_clear();
 }
 
 static int test_arraysize_multiply(size_t nelem, size_t size)
 {
 	size_t out;
-	GITERR_CHECK_ALLOC_MULTIPLY(&out, nelem, size);
+	GIT_ERROR_CHECK_ALLOC_MULTIPLY(&out, nelem, size);
 	return 0;
 }
 
@@ -174,14 +174,14 @@ void test_core_errors__integer_overflow_alloc_multiply(void)
 	cl_git_fail(test_arraysize_multiply(SIZE_MAX-1, sizeof(void *)));
 	cl_git_fail(test_arraysize_multiply((SIZE_MAX/sizeof(void *))+1, sizeof(void *)));
 
-	cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
-	cl_assert_equal_s("Out of memory", giterr_last()->message);
+	cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+	cl_assert_equal_s("Out of memory", git_error_last()->message);
 }
 
 static int test_arraysize_add(size_t one, size_t two)
 {
 	size_t out;
-	GITERR_CHECK_ALLOC_ADD(&out, one, two);
+	GIT_ERROR_CHECK_ALLOC_ADD(&out, one, two);
 	return 0;
 }
 
@@ -194,29 +194,29 @@ void test_core_errors__integer_overflow_alloc_add(void)
 	cl_git_fail(test_arraysize_multiply(SIZE_MAX-1, 2));
 	cl_git_fail(test_arraysize_multiply(SIZE_MAX, SIZE_MAX));
 
-	cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
-	cl_assert_equal_s("Out of memory", giterr_last()->message);
+	cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+	cl_assert_equal_s("Out of memory", git_error_last()->message);
 }
 
 void test_core_errors__integer_overflow_sets_oom(void)
 {
 	size_t out;
 
-	giterr_clear();
+	git_error_clear();
 	cl_assert(!GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX-1, 1));
-	cl_assert_equal_p(NULL, giterr_last());
+	cl_assert_equal_p(NULL, git_error_last());
 
-	giterr_clear();
+	git_error_clear();
 	cl_assert(!GIT_ADD_SIZET_OVERFLOW(&out, 42, 69));
-	cl_assert_equal_p(NULL, giterr_last());
+	cl_assert_equal_p(NULL, git_error_last());
 
-	giterr_clear();
+	git_error_clear();
 	cl_assert(GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX, SIZE_MAX));
-	cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
-	cl_assert_equal_s("Out of memory", giterr_last()->message);
+	cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+	cl_assert_equal_s("Out of memory", git_error_last()->message);
 
-	giterr_clear();
+	git_error_clear();
 	cl_assert(GIT_ADD_SIZET_OVERFLOW(&out, SIZE_MAX, SIZE_MAX));
-	cl_assert_equal_i(GITERR_NOMEMORY, giterr_last()->klass);
-	cl_assert_equal_s("Out of memory", giterr_last()->message);
+	cl_assert_equal_i(GIT_ERROR_NOMEMORY, git_error_last()->klass);
+	cl_assert_equal_s("Out of memory", git_error_last()->message);
 }
diff --git a/tests/core/sha1.c b/tests/core/sha1.c
index c5b20f6e0..f81d40854 100644
--- a/tests/core/sha1.c
+++ b/tests/core/sha1.c
@@ -54,7 +54,7 @@ void test_core_sha1__detect_collision_attack(void)
 #ifdef GIT_SHA1_COLLISIONDETECT
 	GIT_UNUSED(expected);
 	cl_git_fail(sha1_file(&oid, FIXTURE_DIR "/shattered-1.pdf"));
-	cl_assert_equal_s("SHA1 collision attack detected", giterr_last()->message);
+	cl_assert_equal_s("SHA1 collision attack detected", git_error_last()->message);
 #else
 	cl_git_pass(sha1_file(&oid, FIXTURE_DIR "/shattered-1.pdf"));
 	git_oid_fromstr(&expected, "38762cf7f55934b34d179ae6a4c80cadccbb7f0a");
diff --git a/tests/core/strtol.c b/tests/core/strtol.c
index 6f4e63af3..25dbe467c 100644
--- a/tests/core/strtol.c
+++ b/tests/core/strtol.c
@@ -121,6 +121,6 @@ void test_core_strtol__buffer_length_with_leading_sign_truncates(void)
 void test_core_strtol__error_message_cuts_off(void)
 {
 	assert_l32_fails("2147483657foobar", 10);
-	cl_assert(strstr(giterr_last()->message, "2147483657") != NULL);
-	cl_assert(strstr(giterr_last()->message, "foobar") == NULL);
+	cl_assert(strstr(git_error_last()->message, "2147483657") != NULL);
+	cl_assert(strstr(git_error_last()->message, "foobar") == NULL);
 }