lmtp: common: Rename struct lmtp_recipient *rcpt variables to *lrcpt.

diff --git a/src/lmtp/lmtp-common.c b/src/lmtp/lmtp-common.c
index 39ed6c1b4fd13b665ccbb4b36deb88bc12c3ca49..bd6be9ca780cf590439fff8f7b0b9c37f4ec802d 100644 (file)
--- a/src/lmtp/lmtp-common.c
+++ b/src/lmtp/lmtp-common.c
@@ -4,46 +4,46 @@
 #include "smtp-server.h"
 #include "lmtp-common.h"
 
-void lmtp_recipient_init(struct lmtp_recipient *rcpt,
+void lmtp_recipient_init(struct lmtp_recipient *lrcpt,
                         struct client *client,
                         enum lmtp_recipient_type type,
                         struct smtp_server_cmd_ctx *cmd,
                         struct smtp_server_cmd_rcpt *data)
 {
-       rcpt->client = client;
-       rcpt->type = type;
-       rcpt->rcpt_cmd = cmd;
-       rcpt->path = data->path;
+       lrcpt->client = client;
+       lrcpt->type = type;
+       lrcpt->rcpt_cmd = cmd;
+       lrcpt->path = data->path;
 }
 
-void lmtp_recipient_finish(struct lmtp_recipient *rcpt,
+void lmtp_recipient_finish(struct lmtp_recipient *lrcpt,
                           struct smtp_server_recipient *trcpt,
                           unsigned int index)
 {
-       trcpt->context = rcpt;
+       trcpt->context = lrcpt;
 
-       rcpt->path = trcpt->path;
-       rcpt->rcpt = trcpt;
-       rcpt->index = index;
-       rcpt->rcpt_cmd = NULL;
+       lrcpt->path = trcpt->path;
+       lrcpt->rcpt = trcpt;
+       lrcpt->index = index;
+       lrcpt->rcpt_cmd = NULL;
 }
 
 struct lmtp_recipient *
-lmtp_recipient_find_duplicate(struct lmtp_recipient *rcpt,
+lmtp_recipient_find_duplicate(struct lmtp_recipient *lrcpt,
                              struct smtp_server_transaction *trans)
 {
        struct smtp_server_recipient *drcpt;
-       struct lmtp_recipient *dup_rcpt;
+       struct lmtp_recipient *dup_lrcpt;
 
-       i_assert(rcpt->rcpt != NULL);
-       drcpt = smtp_server_transaction_find_rcpt_duplicate(trans, rcpt->rcpt);
+       i_assert(lrcpt->rcpt != NULL);
+       drcpt = smtp_server_transaction_find_rcpt_duplicate(trans, lrcpt->rcpt);
        if (drcpt == NULL)
                return NULL;
 
-       dup_rcpt = drcpt->context;
-       i_assert(dup_rcpt->rcpt == drcpt);
-       i_assert(dup_rcpt->type == rcpt->type);
+       dup_lrcpt = drcpt->context;
+       i_assert(dup_lrcpt->rcpt == drcpt);
+       i_assert(dup_lrcpt->type == lrcpt->type);
 
-       return dup_rcpt;
+       return dup_lrcpt;
 }
 

diff --git a/src/lmtp/lmtp-common.h b/src/lmtp/lmtp-common.h
index 664f933f6ea1d4273434d517ff363ac77a3ead85..590aeae3874c0f158a3fd1fd1ba488f67fd636c7 100644 (file)
--- a/src/lmtp/lmtp-common.h
+++ b/src/lmtp/lmtp-common.h
@@ -22,18 +22,18 @@ struct lmtp_recipient {
        unsigned int index;
 };
 
-void lmtp_recipient_init(struct lmtp_recipient *rcpt,
+void lmtp_recipient_init(struct lmtp_recipient *lrcpt,
                         struct client *client,
                         enum lmtp_recipient_type type,
                         struct smtp_server_cmd_ctx *cmd,
                         struct smtp_server_cmd_rcpt *data);
 
-void lmtp_recipient_finish(struct lmtp_recipient *rcpt,
+void lmtp_recipient_finish(struct lmtp_recipient *lrcpt,
                           struct smtp_server_recipient *trcpt,
                           unsigned int index);
 
 struct lmtp_recipient *
-lmtp_recipient_find_duplicate(struct lmtp_recipient *rcpt,
+lmtp_recipient_find_duplicate(struct lmtp_recipient *lrcpt,
                              struct smtp_server_transaction *trans);
 
 #endif