lib-smtp: Use array_foreach_elem() where possible

diff --git a/src/lib-smtp/smtp-server-cmd-data.c b/src/lib-smtp/smtp-server-cmd-data.c
index 01716b1062e02c90c873880f8e638ff728c7077b..44e292701ea2b2fa95edc9c97853f9f5db5eb7d1 100644 (file)
--- a/src/lib-smtp/smtp-server-cmd-data.c
+++ b/src/lib-smtp/smtp-server-cmd-data.c
@@ -152,13 +152,13 @@ cmd_data_replied_one(struct smtp_server_cmd_ctx *cmd,
 {
        struct smtp_server_connection *conn = cmd->conn;
        struct smtp_server_transaction *trans = conn->state.trans;
-       struct smtp_server_recipient **rcptp;
+       struct smtp_server_recipient *rcpt;
 
        if (trans == NULL || !array_is_created(&trans->rcpt_to))
                return;
 
-       array_foreach_modifiable(&trans->rcpt_to, rcptp)
-               smtp_server_recipient_data_replied(*rcptp);
+       array_foreach_elem(&trans->rcpt_to, rcpt)
+               smtp_server_recipient_data_replied(rcpt);
 }
 
 static void

diff --git a/src/lib-smtp/smtp-server-transaction.c b/src/lib-smtp/smtp-server-transaction.c
index 206b6bdb9b027aeb734f79a01d6bafaeeaaad1ee..d51a635d7f398a3c847fb6cce064976bfa4d5dca 100644 (file)
--- a/src/lib-smtp/smtp-server-transaction.c
+++ b/src/lib-smtp/smtp-server-transaction.c
@@ -121,12 +121,10 @@ smtp_server_transaction_find_rcpt_duplicate(
        struct smtp_server_transaction *trans,
        struct smtp_server_recipient *rcpt)
 {
-       struct smtp_server_recipient *const *rcptp;
+       struct smtp_server_recipient *drcpt;
 
        i_assert(array_is_created(&trans->rcpt_to));
-       array_foreach(&trans->rcpt_to, rcptp) {
-               struct smtp_server_recipient *drcpt = *rcptp;
-
+       array_foreach_elem(&trans->rcpt_to, drcpt) {
                if (drcpt == rcpt)
                        continue;
                if (smtp_address_equals(drcpt->path, rcpt->path) &&
@@ -165,14 +163,14 @@ smtp_server_transaction_rcpt_count(struct smtp_server_transaction *trans)
 void smtp_server_transaction_data_command(struct smtp_server_transaction *trans,
                                          struct smtp_server_cmd_ctx *cmd)
 {
-       struct smtp_server_recipient *const *rcptp;
+       struct smtp_server_recipient *rcpt;
 
        trans->cmd = cmd;
 
        if (!array_is_created(&trans->rcpt_to))
                return;
-       array_foreach(&trans->rcpt_to, rcptp)
-               smtp_server_recipient_data_command(*rcptp, cmd);
+       array_foreach_elem(&trans->rcpt_to, rcpt)
+               smtp_server_recipient_data_command(rcpt, cmd);
 }
 
 void smtp_server_transaction_received(struct smtp_server_transaction *trans,

diff --git a/src/lib-smtp/smtp-submit.c b/src/lib-smtp/smtp-submit.c
index e8a1577fd39c0a2c550b128bbc51470fe4abf0ad..9e7c13f9cc0164f30adde431fa66da3d5972b6d5 100644 (file)
--- a/src/lib-smtp/smtp-submit.c
+++ b/src/lib-smtp/smtp-submit.c
@@ -316,7 +316,7 @@ smtp_submit_send_host(struct smtp_submit *subm)
        struct smtp_client_connection *smtp_conn;
        struct smtp_client_transaction *smtp_trans;
        enum smtp_client_connection_ssl_mode ssl_mode;
-       struct smtp_address *const *rcptp;
+       struct smtp_address *rcpt;
        const char *host;
        in_port_t port;
 
@@ -352,9 +352,9 @@ smtp_submit_send_host(struct smtp_submit *subm)
                subm->mail_from, NULL, 0, smtp_submit_send_host_finished, subm);
        smtp_client_connection_unref(&smtp_conn);
 
-       array_foreach(&subm->rcpt_to, rcptp) {
+       array_foreach_elem(&subm->rcpt_to, rcpt) {
                smtp_client_transaction_add_rcpt(smtp_trans,
-                       *rcptp, NULL, rcpt_to_callback, data_dummy_callback, subm);
+                       rcpt, NULL, rcpt_to_callback, data_dummy_callback, subm);
        }
 
        subm->smtp_client = smtp_client;
@@ -388,7 +388,7 @@ smtp_submit_send_sendmail(struct smtp_submit *subm)
        const struct smtp_submit_settings *set = &subm->session->set;
        const char *const *sendmail_args, *sendmail_bin, *str;
        ARRAY_TYPE(const_string) args;
-       struct smtp_address *const *rcptp;
+       struct smtp_address *rcpt;
        unsigned int i;
        struct program_client_settings pc_set;
        struct program_client *pc;
@@ -407,9 +407,9 @@ smtp_submit_send_sendmail(struct smtp_submit *subm)
        array_push_back(&args, &str);
 
        str = "--"; array_push_back(&args, &str);
-       array_foreach(&subm->rcpt_to, rcptp) {
-               const char *rcpt = smtp_address_encode(*rcptp);
-               array_push_back(&args, &rcpt);
+       array_foreach_elem(&subm->rcpt_to, rcpt) {
+               const char *rcpt_encoded = smtp_address_encode(rcpt);
+               array_push_back(&args, &rcpt_encoded);
        }
        array_append_zero(&args);