From: Timo Sirainen Date: Thu, 13 Apr 2023 21:26:03 +0000 (+0300) Subject: lib-master, global: Rename MASTER_SERVICE_SETTINGS_INSTANCE to SETTINGS_EVENT_INSTANCE X-Git-Tag: 2.4.0~2171 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=035209ad9f3d08b53cacbb2d5bd6da1a3dec08fc;p=thirdparty%2Fdovecot%2Fcore.git 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 c4a6441051..da92ffea47 100644 --- 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 bc50eef3e6..ba9bcadb3b 100644 --- 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 4b9c83ac84..8c8e2116b0 100644 --- 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 d444b4e8be..2337797928 100644 --- 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);