From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Sat, 4 Apr 2020 10:42:03 +0000 (+0200)
Subject: lib-http: test-http-payload - Rename test_server_kill() to test_server_kill_forced().
X-Git-Tag: 2.3.13~716
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6017da187810c733441c59e62c7043a4bb8bbd4b;p=thirdparty%2Fdovecot%2Fcore.git

lib-http: test-http-payload - Rename test_server_kill() to test_server_kill_forced().
---

diff --git a/src/lib-http/test-http-payload.c b/src/lib-http/test-http-payload.c
index 69ef541010..c1fa0c9264 100644
--- a/src/lib-http/test-http-payload.c
+++ b/src/lib-http/test-http-payload.c
@@ -1593,7 +1593,7 @@ static void test_open_server_fd(void)
 	net_set_nonblock(fd_listen, TRUE);
 }
 
-static void test_server_kill(void)
+static void test_server_kill_forced(void)
 {
 	if (server_pid != (pid_t)-1) {
 		(void)kill(server_pid, SIGKILL);
@@ -1655,7 +1655,7 @@ test_run_client_server(
 	io_loop_run(ioloop);
 	test_client_deinit();
 	io_loop_destroy(&ioloop);
-	test_server_kill();
+	test_server_kill_forced();
 
 	test_files_deinit();
 }
@@ -2247,7 +2247,7 @@ static void test_signal_handler(const siginfo_t *si, void *context ATTR_UNUSED)
 	terminating = 1;
 
 	/* make sure we don't leave any pesky children alive */
-	test_server_kill();
+	test_server_kill_forced();
 
 	(void)signal(signo, SIG_DFL);
 	raise(signo);
@@ -2255,7 +2255,7 @@ static void test_signal_handler(const siginfo_t *si, void *context ATTR_UNUSED)
 
 static void test_atexit(void)
 {
-	test_server_kill();
+	test_server_kill_forced();
 }
 
 static void main_init(void)