From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 6 Apr 2020 19:57:50 +0000 (+0200)
Subject: lib-http: test-http-server-errors - Move global initialization to main_init/deinit().
X-Git-Tag: 2.3.13~700
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1efda32fa6bbe851718e39d969a2adcd022a8b19;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: test-http-server-errors - Move global initialization to main_init/deinit().
---

diff --git a/src/lib-http/test-http-server-errors.c b/src/lib-http/test-http-server-errors.c
index 9b0010721f..8a16628c6d 100644
--- a/src/lib-http/test-http-server-errors.c
+++ b/src/lib-http/test-http-server-errors.c
@@ -1026,12 +1026,8 @@ static void test_atexit(void)
 	test_clients_kill_all();
 }
 
-int main(int argc, char *argv[])
+static void main_init(void)
 {
-	int c;
-	int ret;
-
-	lib_init();
 	lib_signals_init();
 
 	atexit(test_atexit);
@@ -1041,6 +1037,20 @@ int main(int argc, char *argv[])
 	lib_signals_set_handler(SIGINT, 0, test_signal_handler, NULL);
 	lib_signals_set_handler(SIGSEGV, 0, test_signal_handler, NULL);
 	lib_signals_set_handler(SIGABRT, 0, test_signal_handler, NULL);
+}
+
+static void main_deinit(void)
+{
+	lib_signals_deinit();
+}
+
+int main(int argc, char *argv[])
+{
+	int c;
+	int ret;
+
+	lib_init();
+	main_init();
 
 	while ((c = getopt(argc, argv, "D")) > 0) {
 		switch (c) {
@@ -1059,8 +1069,8 @@ int main(int argc, char *argv[])
 
 	ret = test_run(test_functions);
 
-	lib_signals_deinit();
+	main_deinit();
 	lib_deinit();
-
+	
 	return ret;
 }