submission: Use array_foreach_elem() where possible

diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c
index cf0956cae0ba3251f4bd7a74b1c9d8784e34ad2d..47831b8792b1c2d223d9fc6470734aa1fb2ecd72 100644 (file)
--- a/src/submission/submission-backend-relay.c
+++ b/src/submission/submission-backend-relay.c
@@ -735,14 +735,13 @@ backend_relay_cmd_data_init_callbacks(struct submission_backend_relay *backend,
                                      struct smtp_server_transaction *trans)
 {
        struct client *client = backend->backend.client;
-       struct submission_recipient *const *rcptp;
+       struct submission_recipient *rcpt;
 
        if (!HAS_ALL_BITS(trans->flags,
                          SMTP_SERVER_TRANSACTION_FLAG_REPLY_PER_RCPT))
                return;
 
-       array_foreach_modifiable(&client->rcpt_to, rcptp) {
-               struct submission_recipient *rcpt = *rcptp;
+       array_foreach_elem(&client->rcpt_to, rcpt) {
                struct smtp_client_transaction_rcpt *relay_rcpt =
                        rcpt->backend_context;
 

diff --git a/src/submission/submission-backend.c b/src/submission/submission-backend.c
index 5bbcdc4e6a5e1f21b008e07b4afa4315c0a0f617..889a24b7a4d48dc89e4488f62fc274cc2cf5d2a1 100644 (file)
--- a/src/submission/submission-backend.c
+++ b/src/submission/submission-backend.c
@@ -77,7 +77,7 @@ static void
 submission_backend_fail_rcpts(struct submission_backend *backend)
 {
        struct client *client = backend->client;
-       struct submission_recipient *const *rcptp;
+       struct submission_recipient *srcpt;
        const char *enh_code = backend->fail_enh_code;
        const char *reason = backend->fail_reason;
 
@@ -87,8 +87,7 @@ submission_backend_fail_rcpts(struct submission_backend *backend)
        if (enh_code == NULL)
                enh_code = "4.0.0";
 
-       array_foreach_modifiable(&client->rcpt_to, rcptp) {
-               struct submission_recipient *srcpt = *rcptp;
+       array_foreach_elem(&client->rcpt_to, srcpt) {
                struct smtp_server_recipient *rcpt = srcpt->rcpt;
 
                if (srcpt->backend != backend)
@@ -232,31 +231,26 @@ submission_backend_trans_free(struct submission_backend *backend,
 void submission_backends_trans_start(struct client *client,
                                     struct smtp_server_transaction *trans)
 {
-       struct submission_backend *const *bkp;
+       struct submission_backend *backend;
 
        i_assert(client->state.backend != NULL);
        submission_backend_trans_start(client->state.backend, trans);
 
-       array_foreach(&client->pending_backends, bkp) {
-               struct submission_backend *backend = *bkp;
-
+       array_foreach_elem(&client->pending_backends, backend)
                submission_backend_trans_start(backend, trans);
-       }
        array_clear(&client->pending_backends);
 }
 
 void submission_backends_trans_free(struct client *client,
                                     struct smtp_server_transaction *trans)
 {
-       struct submission_backend *const *bkp;
+       struct submission_backend *backend;
 
        i_assert(client->state.backend != NULL ||
                 array_count(&client->rcpt_backends) == 0);
 
-       array_foreach(&client->rcpt_backends, bkp) {
-               struct submission_backend *backend = *bkp;
+       array_foreach_elem(&client->rcpt_backends, backend)
                submission_backend_trans_free(backend, trans);
-       }
        array_clear(&client->pending_backends);
        array_clear(&client->rcpt_backends);
        client->state.backend = NULL;
@@ -306,11 +300,10 @@ static void
 submission_backend_add_pending(struct submission_backend *backend)
 {
        struct client *client = backend->client;
+       struct submission_backend *pending_backend;
 
-       struct submission_backend *const *bkp;
-
-       array_foreach(&client->pending_backends, bkp) {
-               if (backend == *bkp)
+       array_foreach_elem(&client->pending_backends, pending_backend) {
+               if (backend == pending_backend)
                        return;
        }
 
@@ -378,7 +371,7 @@ int submission_backends_cmd_data(struct client *client,
                                 struct smtp_server_transaction *trans,
                                 struct istream *data_input, uoff_t data_size)
 {
-       struct submission_backend *const *bkp;
+       struct submission_backend *backend;
        int ret = 0;
 
        i_assert(array_count(&client->rcpt_backends) > 0);
@@ -388,9 +381,7 @@ int submission_backends_cmd_data(struct client *client,
        i_stream_seek(data_input, 0);
 
        /* create the data_input streams first */
-       array_foreach_modifiable(&client->rcpt_backends, bkp) {
-               struct submission_backend *backend = *bkp;
-
+       array_foreach_elem(&client->rcpt_backends, backend) {
                backend->data_input =
                        i_stream_create_sized(data_input, data_size);
                backend->data_size = data_size;
@@ -399,9 +390,7 @@ int submission_backends_cmd_data(struct client *client,
        /* now that all the streams are created, start reading them
           (reading them earlier could have caused the data_input parent's
           offset to change) */
-       array_foreach_modifiable(&client->rcpt_backends, bkp) {
-               struct submission_backend *backend = *bkp;
-
+       array_foreach_elem(&client->rcpt_backends, backend) {
                ret = submission_backend_cmd_data(backend, cmd, trans);
                if (ret < 0)
                        break;

diff --git a/src/submission/submission-recipient.c b/src/submission/submission-recipient.c
index dbcc6ee28898708686359fdaadbb743ac5ad1a0a..a49b038bee73536556a1544994410e385bf0e7ee 100644 (file)
--- a/src/submission/submission-recipient.c
+++ b/src/submission/submission-recipient.c
@@ -39,13 +39,13 @@ submission_recipient_approved(struct smtp_server_recipient *rcpt ATTR_UNUSED,
 {
        struct submission_backend *backend = srcpt->backend;
        struct client *client = backend->client;
-       struct submission_backend *const *bknd_idx;
+       struct submission_backend *rcpt_backend;
        bool backend_found = FALSE;
 
        array_push_back(&client->rcpt_to, &srcpt);
 
-       array_foreach(&client->rcpt_backends, bknd_idx) {
-               if (*bknd_idx == backend) {
+       array_foreach_elem(&client->rcpt_backends, rcpt_backend) {
+               if (rcpt_backend == backend) {
                        backend_found = TRUE;
                        break;
                }