From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 4 Feb 2021 00:00:28 +0000 (+0200)
Subject: lib-storage: Rename mail_storage_service_input.parent_event to event_parent
X-Git-Tag: 2.3.15~146
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=040ec0936314171016906ca040f0e91f3d94d5c1;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Rename mail_storage_service_input.parent_event to event_parent

This makes it more consistent with other settings.
---

diff --git a/src/imap/main.c b/src/imap/main.c
index 35ae2de082..32cce5d6ca 100644
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -273,7 +273,7 @@ int client_create_from_input(const struct mail_storage_service_input *input,
 		event_add_int(event, "remote_port", input->remote_port);
 
 	service_input = *input;
-	service_input.parent_event = event;
+	service_input.event_parent = event;
 	if (mail_storage_service_lookup_next(storage_service, &service_input,
 					     &user, &mail_user, error_r) <= 0) {
 		event_unref(&event);
diff --git a/src/lda/main.c b/src/lda/main.c
index 4244bec1ed..9a1064b004 100644
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -540,7 +540,7 @@ int main(int argc, char *argv[])
 	service_input.module = "lda";
 	service_input.service = "lda";
 	service_input.username = user;
-	service_input.parent_event = event;
+	service_input.event_parent = event;
 
 	service_flags |= MAIL_STORAGE_SERVICE_FLAG_USE_SYSEXITS;
 	storage_service = mail_storage_service_init(master_service, set_roots,
diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index e3fdd17af7..797cbf6eb8 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1347,7 +1347,7 @@ mail_storage_service_lookup_real(struct mail_storage_service_ctx *ctx,
 	/* Create an event that will be used as the default event for logging.
 	   This event won't be a parent to any other events - mail_user.event
 	   will be used for that. */
-	user->event = event_create(input->parent_event);
+	user->event = event_create(input->event_parent);
 	event_set_forced_debug(user->event,
 			       user->service_ctx->debug || (flags & MAIL_STORAGE_SERVICE_FLAG_DEBUG) != 0);
 	event_add_fields(user->event, (const struct event_add_field []){
diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index 042a7bbb44..09d8ff48f0 100644
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -37,7 +37,7 @@ enum mail_storage_service_flags {
 };
 
 struct mail_storage_service_input {
-	struct event *parent_event;
+	struct event *event_parent;
 
 	const char *module;
 	const char *service;
diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 776b4758c8..055641efa4 100644
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -326,7 +326,7 @@ int lmtp_local_rcpt(struct client *client, struct smtp_server_cmd_ctx *cmd,
 	input.forward_fields = lrcpt->forward_fields;
 
 	event_add_str(rcpt->event, "session", session_id);
-	input.parent_event = rcpt->event;
+	input.event_parent = rcpt->event;
 
 	ret = mail_storage_service_lookup(storage_service, &input,
 					  &service_user, &error);
diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index 930bb155aa..e24a032ac0 100644
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -146,7 +146,7 @@ static void client_handle_request(struct quota_client *client)
 	}
 
 	i_zero(&input);
-	input.parent_event = client->event;
+	input.event_parent = client->event;
 	smtp_address_detail_parse_temp(quota_status_settings->recipient_delimiter,
 				       rcpt, &input.username, &delim,
 				       &detail);