From 4be63a68667d3c75a3da36b3bc8045459a360906 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 8 Dec 2020 18:01:03 +0000 Subject: errors: drop unneccessary g_git prefix --- src/libgit2/errors.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libgit2/errors.c b/src/libgit2/errors.c index 3614b9ce5..1b94a5cf4 100644 --- a/src/libgit2/errors.c +++ b/src/libgit2/errors.c @@ -16,12 +16,12 @@ * New error handling ********************************************/ -static git_error g_git_oom_error = { +static git_error oom_error = { "Out of memory", GIT_ERROR_NOMEMORY }; -static git_error g_git_uninitialized_error = { +static git_error uninitialized_error = { "libgit2 has not been initialized; you must call git_libgit2_init", GIT_ERROR_INVALID }; @@ -52,7 +52,7 @@ static void set_error(int error_class, char *string) void git_error_set_oom(void) { - GIT_THREADSTATE->last_error = &g_git_oom_error; + GIT_THREADSTATE->last_error = &oom_error; } void git_error_set(int error_class, const char *fmt, ...) @@ -134,7 +134,7 @@ const git_error *git_error_last(void) { /* If the library is not initialized, return a static error. */ if (!git_libgit2_init_count()) - return &g_git_uninitialized_error; + return &uninitialized_error; return GIT_THREADSTATE->last_error; } @@ -150,13 +150,13 @@ int git_error_state_capture(git_error_state *state, int error_code) return 0; state->error_code = error_code; - state->oom = (error == &g_git_oom_error); + state->oom = (error == &oom_error); if (error) { state->error_msg.klass = error->klass; if (state->oom) - state->error_msg.message = g_git_oom_error.message; + state->error_msg.message = oom_error.message; else state->error_msg.message = git_str_detach(error_buf); } -- cgit v1.2.1