threadstate: don't use an unnecessary macro

Now that we've reduced the usage of GIT_THREADSTATE, remove it entirely in favor of git_threadstate_get().
libgit2 · May 13, 2023 · 062b3e4 · 062b3e4
1 parent a97a633
commit 062b3e4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/src/libgit2/errors.c b/src/libgit2/errors.c
@@ -33,7 +33,7 @@ static git_error tlsdata_error = {
 
 static void set_error_from_buffer(int error_class)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 	git_error *error;
 	git_str *buf;
 
@@ -51,7 +51,7 @@ static void set_error_from_buffer(int error_class)
 
 static void set_error(int error_class, char *string)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 	git_str *buf;
 
 	if (!threadstate)
@@ -71,7 +71,7 @@ static void set_error(int error_class, char *string)
 
 void git_error_set_oom(void)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 
 	if (!threadstate)
 		return;
@@ -90,7 +90,7 @@ void git_error_set(int error_class, const char *fmt, ...)
 
 void git_error_vset(int error_class, const char *fmt, va_list ap)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 	int error_code = (error_class == GIT_ERROR_OS) ? errno : 0;
 	git_str *buf;
 
@@ -135,7 +135,7 @@ void git_error_vset(int error_class, const char *fmt, va_list ap)
 
 int git_error_set_str(int error_class, const char *string)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 	git_str *buf;
 
 	GIT_ASSERT_ARG(string);
@@ -157,7 +157,7 @@ int git_error_set_str(int error_class, const char *string)
 
 void git_error_clear(void)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 
 	if (!threadstate)
 		return;
@@ -181,15 +181,15 @@ const git_error *git_error_last(void)
 	if (!git_libgit2_init_count())
 		return &uninitialized_error;
 
-	if ((threadstate = GIT_THREADSTATE) == NULL)
+	if ((threadstate = git_threadstate_get()) == NULL)
 		return &tlsdata_error;
 
 	return threadstate->last_error;
 }
 
 int git_error_state_capture(git_error_state *state, int error_code)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 	git_error *error;
 	git_str *error_buf;
 

diff --git a/src/libgit2/oid.c b/src/libgit2/oid.c
@@ -155,7 +155,7 @@ int git_oid_pathfmt(char *str, const git_oid *oid)
 
 char *git_oid_tostr_s(const git_oid *oid)
 {
-	git_threadstate *threadstate = GIT_THREADSTATE;
+	git_threadstate *threadstate = git_threadstate_get();
 	char *str;
 
 	if (!threadstate)

diff --git a/src/libgit2/threadstate.h b/src/libgit2/threadstate.h
@@ -19,6 +19,4 @@ typedef struct {
 extern int git_threadstate_global_init(void);
 extern git_threadstate *git_threadstate_get(void);
 
-#define GIT_THREADSTATE (git_threadstate_get())
-
 #endif