From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 12 May 2023 14:45:32 +0000 (+0300)
Subject: master: service_anvil_send_log_fd() - Avoid using global services variable
X-Git-Tag: 2.4.0~2766
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cd9aef952448ad01f02928ec3259951372dae13;p=thirdparty%2Fdovecot%2Fcore.git

master: service_anvil_send_log_fd() - Avoid using global services variable

This just makes the code clearer and less likely to break in the future.
---

diff --git a/src/master/service-anvil.c b/src/master/service-anvil.c
index d5a3d09abe..1c2adc5641 100644
--- a/src/master/service-anvil.c
+++ b/src/master/service-anvil.c
@@ -127,7 +127,7 @@ void service_anvil_process_destroyed(struct service_process *process)
 	service_anvil_global->restarted = TRUE;
 }
 
-void service_anvil_send_log_fd(void)
+void service_anvil_send_log_fd(struct service_list *service_list)
 {
 	ssize_t ret;
 	char b = 0;
@@ -136,7 +136,7 @@ void service_anvil_send_log_fd(void)
 		return;
 
 	ret = fd_send(service_anvil_global->log_fdpass_fd[1],
-		      services->anvil->log_fd[1], &b, 1);
+		      service_list->anvil->log_fd[1], &b, 1);
 	if (ret < 0)
 		i_error("fd_send(anvil log fd) failed: %m");
 	else if (ret == 0)
diff --git a/src/master/service-anvil.h b/src/master/service-anvil.h
index b749134f62..da3ff35238 100644
--- a/src/master/service-anvil.h
+++ b/src/master/service-anvil.h
@@ -28,7 +28,7 @@ void service_anvil_monitor_start(struct service_list *service_list);
 void service_anvil_process_created(struct service_process *process);
 void service_anvil_process_destroyed(struct service_process *process);
 
-void service_anvil_send_log_fd(void);
+void service_anvil_send_log_fd(struct service_list *service_list);
 
 void service_anvil_global_init(void);
 void service_anvil_global_deinit(void);
diff --git a/src/master/service-log.c b/src/master/service-log.c
index 39a2e1cb92..8861972736 100644
--- a/src/master/service-log.c
+++ b/src/master/service-log.c
@@ -111,7 +111,7 @@ int services_log_init(struct service_list *service_list)
 		return -1;
 	}
 
-	service_anvil_send_log_fd();
+	service_anvil_send_log_fd(service_list);
 	return 0;
 }