lmtp: Rename struct smtp_server_recipient *trcpt variables to *rcpt.

diff --git a/src/lmtp/lmtp-common.c b/src/lmtp/lmtp-common.c
index bd6be9ca780cf590439fff8f7b0b9c37f4ec802d..f740600a24961d49c8e7ae07b88892771971327c 100644 (file)
--- a/src/lmtp/lmtp-common.c
+++ b/src/lmtp/lmtp-common.c
@@ -17,13 +17,13 @@ void lmtp_recipient_init(struct lmtp_recipient *lrcpt,
 }
 
 void lmtp_recipient_finish(struct lmtp_recipient *lrcpt,
-                          struct smtp_server_recipient *trcpt,
+                          struct smtp_server_recipient *rcpt,
                           unsigned int index)
 {
-       trcpt->context = lrcpt;
+       rcpt->context = lrcpt;
 
-       lrcpt->path = trcpt->path;
-       lrcpt->rcpt = trcpt;
+       lrcpt->path = rcpt->path;
+       lrcpt->rcpt = rcpt;
        lrcpt->index = index;
        lrcpt->rcpt_cmd = NULL;
 }

diff --git a/src/lmtp/lmtp-common.h b/src/lmtp/lmtp-common.h
index 590aeae3874c0f158a3fd1fd1ba488f67fd636c7..a2dc1f86289fcb582da288f95aeee3d286908ac0 100644 (file)
--- a/src/lmtp/lmtp-common.h
+++ b/src/lmtp/lmtp-common.h
@@ -29,7 +29,7 @@ void lmtp_recipient_init(struct lmtp_recipient *lrcpt,
                         struct smtp_server_cmd_rcpt *data);
 
 void lmtp_recipient_finish(struct lmtp_recipient *lrcpt,
-                          struct smtp_server_recipient *trcpt,
+                          struct smtp_server_recipient *rcpt,
                           unsigned int index);
 
 struct lmtp_recipient *

diff --git a/src/lmtp/lmtp-local.c b/src/lmtp/lmtp-local.c
index 5d7ab8837432babafcb887776dfdc6c80ed58014..87bcd43f1bc986d5b3b485a089eb1c0f320fab8e 100644 (file)
--- a/src/lmtp/lmtp-local.c
+++ b/src/lmtp/lmtp-local.c
@@ -255,10 +255,10 @@ lmtp_local_rcpt_check_quota(struct lmtp_local_recipient *llrcpt)
 static void lmtp_local_rcpt_finished(
        struct smtp_server_cmd_ctx *cmd,
        struct smtp_server_transaction *trans,
-       struct smtp_server_recipient *trcpt,
+       struct smtp_server_recipient *rcpt,
        unsigned int index)
 {
-       struct lmtp_local_recipient *llrcpt = trcpt->context;
+       struct lmtp_local_recipient *llrcpt = rcpt->context;
        struct client *client = llrcpt->rcpt.client;
 
        smtp_server_command_remove_hook(
@@ -272,7 +272,7 @@ static void lmtp_local_rcpt_finished(
                return;
        }
 
-       lmtp_recipient_finish(&llrcpt->rcpt, trcpt, index);
+       lmtp_recipient_finish(&llrcpt->rcpt, rcpt, index);
 
        /* resolve duplicate recipient */
        llrcpt->duplicate = (struct lmtp_local_recipient *)
@@ -469,8 +469,8 @@ lmtp_local_deliver(struct lmtp_local *local,
                   struct mail_deliver_session *session)
 {
        struct client *client = local->client;
-       struct smtp_server_recipient *trcpt = llrcpt->rcpt.rcpt;
-       struct smtp_address *rcpt_to = trcpt->path;
+       struct smtp_server_recipient *rcpt = llrcpt->rcpt.rcpt;
+       struct smtp_address *rcpt_to = rcpt->path;
        unsigned int rcpt_idx = llrcpt->rcpt.index;
        struct mail_storage_service_user *service_user = llrcpt->service_user;
        struct mail_deliver_context dctx;
@@ -578,8 +578,7 @@ lmtp_local_deliver(struct lmtp_local *local,
 
        /* RCPT TO */
        dctx.rcpt_user = rcpt_user;
-       smtp_params_rcpt_copy(dctx.pool,
-               &dctx.rcpt_params, &trcpt->params);
+       smtp_params_rcpt_copy(dctx.pool, &dctx.rcpt_params, &rcpt->params);
        if (dctx.rcpt_params.orcpt.addr == NULL &&
                *dctx.set->lda_original_recipient_header != '\0') {
                dctx.rcpt_params.orcpt.addr =

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index 015a26eb0eae6611c4e573108c6f5ae3a9d978bc..fe9e1a019ef99f40188cb17f61c8938640127b24 100644 (file)
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -446,10 +446,10 @@ lmtp_proxy_rcpt_cmd_destroy(struct smtp_server_cmd_ctx *cmd ATTR_UNUSED,
 static void
 lmtp_proxy_rcpt_finished(struct smtp_server_cmd_ctx *cmd,
                         struct smtp_server_transaction *trans ATTR_UNUSED,
-                        struct smtp_server_recipient *trcpt,
+                        struct smtp_server_recipient *rcpt,
                         unsigned int index)
 {
-       struct lmtp_proxy_recipient *lprcpt = trcpt->context;
+       struct lmtp_proxy_recipient *lprcpt = rcpt->context;
        struct client *client = lprcpt->rcpt.client;
 
        if (lprcpt->rcpt.rcpt_cmd != NULL) {
@@ -465,7 +465,7 @@ lmtp_proxy_rcpt_finished(struct smtp_server_cmd_ctx *cmd,
                return;
        }
 
-       lmtp_recipient_finish(&lprcpt->rcpt, trcpt, index);
+       lmtp_recipient_finish(&lprcpt->rcpt, rcpt, index);
 
        /* add to local recipients */
        array_append(&client->proxy->rcpt_to, &lprcpt, 1);