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 d5a3d09abe22daa944e4515b703f37d54c3b2366..1c2adc564127bc466ce771ae5562018a89ac6a3c 100644 (file)
--- 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 b749134f62d16eaf811529ae39b9500dad0f7b02..da3ff35238528c91976c1d6e8719831d9218006a 100644 (file)
--- 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 39a2e1cb922a027ecebd92fe7a28c45f6e6cacef..88619727368b93a727f9dee12c826d413b333dce 100644 (file)
--- 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;
 }