global: Rename master_service_settings_get() to master_service_get_service_settings()

diff --git a/src/anvil/main.c b/src/anvil/main.c
index 8a1dd69bb3073b46198790a66094289f3af88d31..9ba943db8beccd02386f8e8773894be3bce4fa59 100644 (file)
--- a/src/anvil/main.c
+++ b/src/anvil/main.c
@@ -123,7 +123,7 @@ log_fdpass_input(void *context ATTR_UNUSED)
 static void main_init(void)
 {
        const struct master_service_settings *set =
-               master_service_settings_get(master_service);
+               master_service_get_service_settings(master_service);
 
        /* delay dying until all of our clients are gone */
        master_service_set_die_with_master(master_service, FALSE);

diff --git a/src/doveadm/doveadm-log.c b/src/doveadm/doveadm-log.c
index 9e18814684e34329619615defadeb39963a9cc6a..1b1d39d1153f43690988a04c57f766eb70c48eab 100644 (file)
--- a/src/doveadm/doveadm-log.c
+++ b/src/doveadm/doveadm-log.c
@@ -228,7 +228,7 @@ static void cmd_log_find(struct doveadm_cmd_context *cctx)
        hash_table_create(&ctx.files, ctx.pool, 0, str_hash, strcmp);
 
        /* first get the paths that we know are used */
-       set = master_service_settings_get(master_service);
+       set = master_service_get_service_settings(master_service);
        log_file_path = set->log_path;
        if (strcmp(log_file_path, "syslog") == 0)
                log_file_path = "";

diff --git a/src/doveadm/dsync/dsync-brain.c b/src/doveadm/dsync/dsync-brain.c
index c5adabb929c89c57cb92f6d286f132af150dfb05..6ee8ff9c07804ead2c6e4ba5ac3f7418c3d7350b 100644 (file)
--- a/src/doveadm/dsync/dsync-brain.c
+++ b/src/doveadm/dsync/dsync-brain.c
@@ -136,7 +136,7 @@ dsync_brain_common_init(struct mail_user *user, struct dsync_ibc *ibc,
        const struct master_service_settings *service_set;
        pool_t pool;
 
-       service_set = master_service_settings_get(master_service);
+       service_set = master_service_get_service_settings(master_service);
        mail_user_ref(user);
 
        pool = pool_alloconly_create("dsync brain", 10240);

diff --git a/src/imap-hibernate/imap-client.c b/src/imap-hibernate/imap-client.c
index 2ee8c77e663bc305b760240cedd659516d62cda7..21227f44a7cd03e1a92dea6fd440e6a52d9aea18 100644 (file)
--- a/src/imap-hibernate/imap-client.c
+++ b/src/imap-hibernate/imap-client.c
@@ -262,7 +262,7 @@ static bool imap_client_try_move_back(struct imap_client *client)
                return TRUE;
        }
 
-       master_set = master_service_settings_get(master_service);
+       master_set = master_service_get_service_settings(master_service);
        path = t_strconcat(master_set->base_dir,
                           "/"IMAP_MASTER_SOCKET_NAME, NULL);
        ret = imap_master_connection_init(path,

diff --git a/src/indexer/indexer.c b/src/indexer/indexer.c
index 4462c80f6101ca08934e6e88b0211e79824aa0d3..532debfc1821e530988edd5c1f573682548308ea 100644 (file)
--- a/src/indexer/indexer.c
+++ b/src/indexer/indexer.c
@@ -112,7 +112,7 @@ int main(int argc, char *argv[])
        if (master_service_settings_read_simple(master_service, NULL,
                                                &error) < 0)
                i_fatal("Error reading configuration: %s", error);
-       set = master_service_settings_get(master_service);
+       set = master_service_get_service_settings(master_service);
 
        master_service_init_log(master_service);
        restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL);

diff --git a/src/indexer/master-connection.c b/src/indexer/master-connection.c
index 0fb8855d8463a7aa83410b4a7e58560d3f78b0a7..f4b18bdf1b058e02597fde62a1a8967ad9c192ba 100644 (file)
--- a/src/indexer/master-connection.c
+++ b/src/indexer/master-connection.c
@@ -40,7 +40,7 @@ static void ATTR_NULL(1, 2)
 indexer_worker_refresh_proctitle(const char *username, const char *mailbox,
                                 uint32_t seq1, uint32_t seq2)
 {
-       if (!master_service_settings_get(master_service)->verbose_proctitle)
+       if (!master_service_get_service_settings(master_service)->verbose_proctitle)
                return;
 
        if (username == NULL)

diff --git a/src/lib-lua/dlua-dovecot-http.c b/src/lib-lua/dlua-dovecot-http.c
index 3faf97349a7007b302e32cb3f1e0b743a533cee7..1e2d6c87c43e8ff0924fabf011bc5374c2512210 100644 (file)
--- a/src/lib-lua/dlua-dovecot-http.c
+++ b/src/lib-lua/dlua-dovecot-http.c
@@ -431,7 +431,7 @@ static int parse_client_settings(lua_State *L, struct http_client_settings *set,
        struct http_url *parsed_url;
        const char *proxy_url;
        const struct master_service_settings *master_set =
-               master_service_settings_get(master_service);
+               master_service_get_service_settings(master_service);
        /* need to figure out socket dir */
        set->dns_client_socket_path = t_strconcat(master_set->base_dir, "/dns-client", NULL);
        CLIENT_SETTING_STR(user_agent);

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index 41a4537d661475024d9c3479670a33f1ddb5d516..91ee32a0edc61fc51d089ffc3c1f24e9e67ffe56 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -720,7 +720,7 @@ pool_t master_service_settings_detach(struct master_service *service)
 }
 
 const struct master_service_settings *
-master_service_settings_get(struct master_service *service)
+master_service_get_service_settings(struct master_service *service)
 {
        return settings_parser_get_root_set(service->set_parser,
                &master_service_setting_parser_info);

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index d73ea284d349770fb7c5ad60d16207c0b459a9dc..99ea5a6db8980a736c01b24c54f8dad3e1b057bd 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -77,7 +77,7 @@ int master_service_settings_read_simple(struct master_service *service,
 pool_t master_service_settings_detach(struct master_service *service);
 
 const struct master_service_settings *
-master_service_settings_get(struct master_service *service);
+master_service_get_service_settings(struct master_service *service);
 void *master_service_settings_get_root_set(struct master_service *service,
                                           const struct setting_parser_info *root);
 void *master_service_settings_get_root_set_dup(struct master_service *service,

diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index 5505e57b09f1d5e19bca8d06fc542ebd510f0813..728ba8ed7ca8dee9d0599139b728f798ef9ac85b 100644 (file)
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -34,7 +34,7 @@ raw_storage_create_from_set(struct mail_storage_service_ctx *ctx,
        event_disable_callbacks(event);
 
        const struct master_service_settings *service_set =
-               master_service_settings_get(master_service);
+               master_service_get_service_settings(master_service);
        const char *const userdb_fields[] = {
                /* use unwritable home directory */
                t_strdup_printf("home=%s/empty", service_set->base_dir),

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index f0f9f305f9637bbd9afc6d9856127eeb0731d2dd..96c009bbfeea2de0709bcf70de41d4c33a099668 100644 (file)
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -130,7 +130,7 @@ static void client_read_settings(struct client *client, bool ssl)
        if (settings_var_expand(&lmtp_setting_parser_info, lmtp_set,
                                client->pool, tab, &error) <= 0)
                i_fatal("Failed to expand settings: %s", error);
-       client->service_set = master_service_settings_get(master_service);
+       client->service_set = master_service_get_service_settings(master_service);
        client->lmtp_set = lmtp_set;
        client->unexpanded_lda_set = lda_set;
 }

diff --git a/src/log/main.c b/src/log/main.c
index 7988083cae55659330c3b03b9a812ae165296550..a1cbe73dfb425e363a7cbd19c62c66fb0219efbe 100644 (file)
--- a/src/log/main.c
+++ b/src/log/main.c
@@ -84,7 +84,7 @@ int main(int argc, char *argv[])
                i_fatal("Error reading configuration: %s", error);
        master_service_init_log_with_prefix(master_service, global_log_prefix);
 
-       verbose_proctitle = master_service_settings_get(master_service)->verbose_proctitle;
+       verbose_proctitle = master_service_get_service_settings(master_service)->verbose_proctitle;
 
        restrict_access_by_env(RESTRICT_ACCESS_FLAG_ALLOW_ROOT, NULL);
        restrict_access_allow_coredumps(TRUE);

diff --git a/src/master/main.c b/src/master/main.c
index fe6447300edd924753a56b0254da62465ee2cf87..2dc71a77a164c16d59726245a5888e5de0fe7918 100644 (file)
--- a/src/master/main.c
+++ b/src/master/main.c
@@ -924,7 +924,7 @@ int main(int argc, char *argv[])
        fatal_log_check(set);
 
        const struct master_service_settings *service_set =
-               master_service_settings_get(master_service);
+               master_service_get_service_settings(master_service);
        master_service_import_environment(service_set->import_environment);
        master_service_env_clean();
 

diff --git a/src/master/service.c b/src/master/service.c
index 1cb41533495886c65acaa0013ba423fe7e3d67be..0fb6e88d8faed281a3e48ef46a527554be13babe 100644 (file)
--- a/src/master/service.c
+++ b/src/master/service.c
@@ -433,7 +433,7 @@ services_create_real(const struct master_settings *set, pool_t pool,
        service_list->refcount = 1;
        service_list->pool = pool;
        service_list->event = event;
-       service_list->service_set = master_service_settings_get(master_service);
+       service_list->service_set = master_service_get_service_settings(master_service);
        service_list->set_pool = master_service_settings_detach(master_service);
        service_list->set = set;
        service_list->master_log_fd[0] = -1;