]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-http: test-http-client-errors - Move global initialization to main_init/deinit().
authorStephan Bosch <stephan.bosch@open-xchange.com>
Mon, 6 Apr 2020 21:33:02 +0000 (23:33 +0200)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Fri, 22 May 2020 08:42:33 +0000 (08:42 +0000)
src/lib-http/test-http-client-errors.c

index 0150cf0bb9b66363675233323da624bbb3c39612..604c45180f2614b2c0432df62176a9bdd420a5b4 100644 (file)
@@ -3542,12 +3542,8 @@ static void test_atexit(void)
        test_servers_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);
@@ -3557,6 +3553,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) {
@@ -3575,7 +3585,7 @@ int main(int argc, char *argv[])
 
        ret = test_run(test_functions);
 
-       lib_signals_deinit();
+       main_deinit();
        lib_deinit();
 
        return ret;