From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sun, 5 Apr 2020 00:32:48 +0000 (+0200)
Subject: lib-smtp: test-smtp-payload - Move global initialization to main_init/deinit().
X-Git-Tag: 2.3.13~645
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=671854cfc0f0cc459e67bfa9ad5e25f20a58f97b;p=thirdparty%2Fdovecot%2Fcore.git

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

diff --git a/src/lib-smtp/test-smtp-payload.c b/src/lib-smtp/test-smtp-payload.c
index 6db5729804..e321fdd39a 100644
--- a/src/lib-smtp/test-smtp-payload.c
+++ b/src/lib-smtp/test-smtp-payload.c
@@ -1097,12 +1097,8 @@ static void test_atexit(void)
 	test_server_kill();
 }
 
-int main(int argc, char *argv[])
+static void main_init(void)
 {
-	int c;
-	int ret;
-
-	lib_init();
 	lib_signals_init();
 #ifdef HAVE_OPENSSL
 	ssl_iostream_openssl_init();
@@ -1115,6 +1111,24 @@ 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)
+{
+	ssl_iostream_context_cache_free();
+#ifdef HAVE_OPENSSL
+	ssl_iostream_openssl_deinit();
+#endif
+	lib_signals_deinit();
+}
+
+int main(int argc, char *argv[])
+{
+	int c;
+	int ret;
+
+	lib_init();
+	main_init();
 
 	while ((c = getopt(argc, argv, "DS")) > 0) {
 		switch (c) {
@@ -1136,11 +1150,7 @@ int main(int argc, char *argv[])
 
 	ret = test_run(test_functions);
 
-	ssl_iostream_context_cache_free();
-#ifdef HAVE_OPENSSL
-	ssl_iostream_openssl_deinit();
-#endif
-	lib_signals_deinit();
+	main_deinit();
 	lib_deinit();
 
 	return ret;