lib-master, global: Rename MASTER_SERVICE_SETTINGS_INSTANCE to SETTINGS_EVENT_INSTANCE

diff --git a/src/lib-master/master-service-settings.c b/src/lib-master/master-service-settings.c
index c4a6441051ca140bba7a579d8066524859578420..da92ffea478694a94089629cca37d890a475371d 100644 (file)
--- a/src/lib-master/master-service-settings.c
+++ b/src/lib-master/master-service-settings.c
@@ -1321,8 +1321,7 @@ int master_service_settings_get(struct event *event,
        struct event *scan_event = event;
 
        while (scan_event != NULL) {
-               instance = event_get_ptr(scan_event,
-                                        MASTER_SERVICE_SETTINGS_INSTANCE);
+               instance = event_get_ptr(scan_event, SETTINGS_EVENT_INSTANCE);
                if (instance != NULL)
                        break;
                scan_event = event_get_parent(scan_event);

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index bc50eef3e64e43077ce234fccf7a65f286ebb376..ba9bcadb3b9544b16a69645ab10c8150a63e3eb5 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -90,8 +90,7 @@ struct master_service_settings_output {
 
 /* Set struct settings_instance to events so master_service_settings_get() can
    use it to get instance-specific settings. */
-#define MASTER_SERVICE_SETTINGS_INSTANCE \
-       "master_service_settings_instance"
+#define SETTINGS_EVENT_INSTANCE "settings_instance"
 
 /* Set struct var_expand_table to be used for settings expansion. The table is
    expected to be accessible until the event is freed or the table is cleared

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 4b9c83ac84710b775a4b4ccfc1e72d8d6584264d..8c8e2116b02a8f1475bed7670ecc1173c118408b 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1059,7 +1059,7 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
           This event won't be a parent to any other events - mail_user.event
           will be used for that. */
        struct event *event = event_create(input->event_parent);
-       event_set_ptr(event, MASTER_SERVICE_SETTINGS_INSTANCE, set_instance);
+       event_set_ptr(event, SETTINGS_EVENT_INSTANCE, set_instance);
 
        struct mail_storage_service_init_var_expand_ctx var_expand_ctx = {
                .ctx = ctx,

diff --git a/src/lmtp/lmtp-client.c b/src/lmtp/lmtp-client.c
index d444b4e8be5862eefc000d0428c73cbd3424711c..233779792822b6bb73ddf29d79bd5f4a0392f6f5 100644 (file)
--- a/src/lmtp/lmtp-client.c
+++ b/src/lmtp/lmtp-client.c
@@ -112,7 +112,7 @@ static void client_read_settings(struct client *client, bool ssl)
        input.username = "";
 
        client->set_instance = settings_instance_new(master_service);
-       event_set_ptr(client->event, MASTER_SERVICE_SETTINGS_INSTANCE,
+       event_set_ptr(client->event, SETTINGS_EVENT_INSTANCE,
                      client->set_instance);
        client->raw_mail_user =
                raw_storage_create_from_set(storage_service, client->set_instance);