From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 7 Oct 2018 22:44:28 +0000 (+0200)
Subject: submission: Rename struct submission_recipient *rcpt variables to *srcpt.
X-Git-Tag: 2.3.9~1220
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e52357b7855a1d3955657f6d439f2818b632f2c5;p=thirdparty%2Fdovecot%2Fcore.git

submission: Rename struct submission_recipient *rcpt variables to *srcpt.
---

diff --git a/src/submission/submission-client.h b/src/submission/submission-client.h
index 84ba7e0651..4c7a81b2c1 100644
--- a/src/submission/submission-client.h
+++ b/src/submission/submission-client.h
@@ -37,7 +37,7 @@ struct submission_client_vfuncs {
 	int (*cmd_mail)(struct client *client, struct smtp_server_cmd_ctx *cmd,
 			struct smtp_server_cmd_mail *data);
 	int (*cmd_rcpt)(struct client *client,
-			struct submission_recipient *rcpt,
+			struct submission_recipient *srcpt,
 			struct smtp_server_cmd_ctx *cmd,
 			struct smtp_server_cmd_rcpt *data);
 	int (*cmd_rset)(struct client *client, struct smtp_server_cmd_ctx *cmd);
diff --git a/src/submission/submission-commands.c b/src/submission/submission-commands.c
index ae449677ce..2cf03df603 100644
--- a/src/submission/submission-commands.c
+++ b/src/submission/submission-commands.c
@@ -146,9 +146,9 @@ int client_default_cmd_mail(struct client *client,
 
 static void
 cmd_rcpt_destroy(struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
-		 struct submission_recipient *rcpt)
+		 struct submission_recipient *srcpt)
 {
-	submission_recipient_destroy(&rcpt);
+	submission_recipient_destroy(&srcpt);
 }
 
 static void
@@ -157,34 +157,34 @@ submission_rcpt_finished(struct smtp_server_cmd_ctx *cmd,
 			 struct smtp_server_recipient *trcpt,
 			 unsigned int index)
 {
-	struct submission_recipient *rcpt = trcpt->context;
+	struct submission_recipient *srcpt = trcpt->context;
 
 	smtp_server_command_remove_hook(cmd->cmd,
 					SMTP_SERVER_COMMAND_HOOK_DESTROY,
 					cmd_rcpt_destroy);
 
-	submission_recipient_finished(rcpt, trcpt, index);
+	submission_recipient_finished(srcpt, trcpt, index);
 }
 
 int cmd_rcpt(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
 	     struct smtp_server_cmd_rcpt *data)
 {
 	struct client *client = conn_ctx;
-	struct submission_recipient *rcpt;
+	struct submission_recipient *srcpt;
 
-	rcpt = submission_recipient_create(client, data->path);
+	srcpt = submission_recipient_create(client, data->path);
 
 	smtp_server_command_add_hook(cmd->cmd, SMTP_SERVER_COMMAND_HOOK_DESTROY,
-				     cmd_rcpt_destroy, rcpt);
+				     cmd_rcpt_destroy, srcpt);
 
-	data->trans_context = rcpt;
+	data->trans_context = srcpt;
 	data->hook_finished = submission_rcpt_finished;
 
-	return client->v.cmd_rcpt(client, rcpt, cmd, data);
+	return client->v.cmd_rcpt(client, srcpt, cmd, data);
 }
 
 int client_default_cmd_rcpt(struct client *client ATTR_UNUSED,
-			    struct submission_recipient *rcpt,
+			    struct submission_recipient *srcpt,
 			    struct smtp_server_cmd_ctx *cmd,
 			    struct smtp_server_cmd_rcpt *data)
 {
@@ -192,9 +192,9 @@ int client_default_cmd_rcpt(struct client *client ATTR_UNUSED,
 
 	trans = smtp_server_connection_get_transaction(cmd->conn);
 	if (trans != NULL)
-		submission_backend_trans_start(rcpt->backend, trans);
+		submission_backend_trans_start(srcpt->backend, trans);
 
-	return submission_backend_cmd_rcpt(rcpt->backend, cmd, data);
+	return submission_backend_cmd_rcpt(srcpt->backend, cmd, data);
 }
 
 /*
diff --git a/src/submission/submission-commands.h b/src/submission/submission-commands.h
index c54e689bea..c89f572870 100644
--- a/src/submission/submission-commands.h
+++ b/src/submission/submission-commands.h
@@ -34,7 +34,7 @@ int cmd_rcpt(void *conn_ctx, struct smtp_server_cmd_ctx *cmd,
 	     struct smtp_server_cmd_rcpt *data);
 
 int client_default_cmd_rcpt(struct client *client ATTR_UNUSED,
-			    struct submission_recipient *rcpt,
+			    struct submission_recipient *srcpt,
 			    struct smtp_server_cmd_ctx *cmd,
 			    struct smtp_server_cmd_rcpt *data);
 
diff --git a/src/submission/submission-recipient.c b/src/submission/submission-recipient.c
index 840432e908..27b8829b7a 100644
--- a/src/submission/submission-recipient.c
+++ b/src/submission/submission-recipient.c
@@ -11,42 +11,42 @@ submission_recipient_module_register = { 0 };
 struct submission_recipient *
 submission_recipient_create(struct client *client, struct smtp_address *path)
 {
-	struct submission_recipient *rcpt;
+	struct submission_recipient *srcpt;
 	pool_t pool;
 
 	pool = pool_alloconly_create("submission recipient", 512);
-	rcpt = p_new(pool, struct submission_recipient, 1);
-	rcpt->pool = pool;
-	rcpt->backend = client->state.backend;
-	rcpt->path = path;
+	srcpt = p_new(pool, struct submission_recipient, 1);
+	srcpt->pool = pool;
+	srcpt->backend = client->state.backend;
+	srcpt->path = path;
 
-	p_array_init(&rcpt->module_contexts, rcpt->pool, 5);
+	p_array_init(&srcpt->module_contexts, srcpt->pool, 5);
 
-	return rcpt;
+	return srcpt;
 }
 
-void submission_recipient_destroy(struct submission_recipient **_rcpt)
+void submission_recipient_destroy(struct submission_recipient **_srcpt)
 {
-	struct submission_recipient *rcpt = *_rcpt;
+	struct submission_recipient *srcpt = *_srcpt;
 
-	*_rcpt = NULL;
+	*_srcpt = NULL;
 
-	pool_unref(&rcpt->pool);
+	pool_unref(&srcpt->pool);
 }
 
-void submission_recipient_finished(struct submission_recipient *rcpt,
+void submission_recipient_finished(struct submission_recipient *srcpt,
 				   struct smtp_server_recipient *trcpt,
 				   unsigned int index)
 {
-	struct submission_backend *backend = rcpt->backend;
+	struct submission_backend *backend = srcpt->backend;
 	struct client *client = backend->client;
 	struct submission_backend *const *bknd_idx;
 	bool backend_found = FALSE;
 
-	rcpt->path = trcpt->path;
-	rcpt->index = index;
+	srcpt->path = trcpt->path;
+	srcpt->index = index;
 
-	array_append(&client->rcpt_to, &rcpt, 1);
+	array_append(&client->rcpt_to, &srcpt, 1);
 
 	array_foreach(&client->rcpt_backends, bknd_idx) {
 		if (*bknd_idx == backend) {
diff --git a/src/submission/submission-recipient.h b/src/submission/submission-recipient.h
index 57a4016513..1ad7142252 100644
--- a/src/submission/submission-recipient.h
+++ b/src/submission/submission-recipient.h
@@ -28,8 +28,8 @@ submission_recipient_module_register;
 
 struct submission_recipient *
 submission_recipient_create(struct client *client, struct smtp_address *path);
-void submission_recipient_destroy(struct submission_recipient **_rcpt);
-void submission_recipient_finished(struct submission_recipient *rcpt,
+void submission_recipient_destroy(struct submission_recipient **_srcpt);
+void submission_recipient_finished(struct submission_recipient *srcpt,
 				   struct smtp_server_recipient *trcpt,
 				   unsigned int index);