settings: localize global data

Move the settings global data teardown into its own separate function,
instead of intermingled with the global state.

1 files changed, 22 insertions, 10 deletions

diff --git a/src/settings.c b/src/settings.c
index 69ebcb7ab..0426093ea 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -29,6 +29,28 @@
 #include "streams/openssl.h"
 #include "streams/mbedtls.h"
 
+/* Declarations for tuneable settings */
+extern size_t git_mwindow__window_size;
+extern size_t git_mwindow__mapped_limit;
+extern size_t git_mwindow__file_limit;
+extern size_t git_indexer__max_objects;
+extern bool git_disable_pack_keep_file_checks;
+
+char *git__user_agent;
+char *git__ssl_ciphers;
+
+static void git_settings_global_shutdown(void)
+{
+	git__free(git__user_agent);
+	git__free(git__ssl_ciphers);
+}
+
+int git_settings_global_init(void)
+{
+	git__on_shutdown(git_settings_global_shutdown);
+	return 0;
+}
+
 int git_libgit2_version(int *major, int *minor, int *rev)
 {
 	*major = LIBGIT2_VER_MAJOR;
@@ -56,13 +78,6 @@ int git_libgit2_features(void)
 	;
 }
 
-/* Declarations for tuneable settings */
-extern size_t git_mwindow__window_size;
-extern size_t git_mwindow__mapped_limit;
-extern size_t git_mwindow__file_limit;
-extern size_t git_indexer__max_objects;
-extern bool git_disable_pack_keep_file_checks;
-
 static int config_level_to_sysdir(int config_level)
 {
 	int val = -1;
@@ -88,9 +103,6 @@ static int config_level_to_sysdir(int config_level)
 	return val;
 }
 
-extern char *git__user_agent;
-extern char *git__ssl_ciphers;
-
 const char *git_libgit2__user_agent(void)
 {
 	return git__user_agent;