From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Thu, 9 Apr 2020 08:50:03 +0000 (+0200)
Subject: lib-smtp: test-smtp-server-errors - Move global initialization to main_init/deinit().
X-Git-Tag: 2.3.13~625
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb954e32b1248b5a70c4171839e98c0cedc0f50d;p=thirdparty%2Fdovecot%2Fcore.git

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

diff --git a/src/lib-smtp/test-smtp-server-errors.c b/src/lib-smtp/test-smtp-server-errors.c
index 0415c2aad1..1175c4ee59 100644
--- a/src/lib-smtp/test-smtp-server-errors.c
+++ b/src/lib-smtp/test-smtp-server-errors.c
@@ -3070,12 +3070,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);
@@ -3085,6 +3081,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) {
@@ -3103,7 +3113,7 @@ int main(int argc, char *argv[])
 
 	ret = test_run(test_functions);
 
-	lib_signals_deinit();
+	main_deinit();
 	lib_deinit();
 
 	return ret;