global: Use array_pop_back

@@
expression A;
@@

-array_delete(A, array_count(A)-1, 1)
+array_pop_back(A)

And manually fixing the few missed ones

diff --git a/src/doveadm/doveadm-cmd.c b/src/doveadm/doveadm-cmd.c
index 3e5d7211b85df71b162e53256546c9c562a7289d..2fcd5fdef16a0b740a271f3cf54231785a2b4b4c 100644 (file)
--- a/src/doveadm/doveadm-cmd.c
+++ b/src/doveadm/doveadm-cmd.c
@@ -341,7 +341,7 @@ void doveadm_cmd_params_null_terminate_arrays(ARRAY_TYPE(doveadm_cmd_param_arr_t
                if (param->type == CMD_PARAM_ARRAY &&
                    array_is_created(&param->value.v_array)) {
                        array_append_zero(&param->value.v_array);
-                       array_delete(&param->value.v_array, array_count(&param->value.v_array)-1, 1);
+                       array_pop_back(&param->value.v_array);
                }
        }
 }

diff --git a/src/imap/imap-fetch.c b/src/imap/imap-fetch.c
index 3fe515eccf0d8bfb129bb3441c213c694bd36437..23bf17167b721bd14bc3361baa74f81fa8fe1a6a 100644 (file)
--- a/src/imap/imap-fetch.c
+++ b/src/imap/imap-fetch.c
@@ -382,8 +382,7 @@ void imap_fetch_begin(struct imap_fetch_context *ctx, struct mailbox *box,
 
                headers = array_first(&ctx->all_headers);
                wanted_headers = mailbox_header_lookup_init(box, headers);
-               array_delete(&ctx->all_headers,
-                            array_count(&ctx->all_headers)-1, 1);
+               array_pop_back(&ctx->all_headers);
        }
 
        if (ctx->flags_update_seen) {

diff --git a/src/lib-fts/fts-filter-normalizer-icu.c b/src/lib-fts/fts-filter-normalizer-icu.c
index 733101d4d4309dab7c2edb69bf0074a499bfbda2..5f0f8e30a1be0ca1b894fafbbf41ae94d72eed52 100644 (file)
--- a/src/lib-fts/fts-filter-normalizer-icu.c
+++ b/src/lib-fts/fts-filter-normalizer-icu.c
@@ -88,7 +88,7 @@ fts_filter_normalizer_icu_filter(struct fts_filter *filter, const char **token,
 
        fts_icu_utf8_to_utf16(&np->utf16_token, *token);
        array_append_zero(&np->utf16_token);
-       array_delete(&np->utf16_token, array_count(&np->utf16_token)-1, 1);
+       array_pop_back(&np->utf16_token);
        array_clear(&np->trans_token);
        if (fts_icu_translate(&np->trans_token, array_first(&np->utf16_token),
                              array_count(&np->utf16_token),

diff --git a/src/lib-imap/imap-parser.c b/src/lib-imap/imap-parser.c
index 8e9b36e075ef414087f7573caf5f001b3b489a0e..08ef28ed9efa88029e1d461513d0ab12c6e68bbe 100644 (file)
--- a/src/lib-imap/imap-parser.c
+++ b/src/lib-imap/imap-parser.c
@@ -779,8 +779,7 @@ int imap_parser_read_args(struct imap_parser *parser, unsigned int count,
 
        if (parser->args_added_extra_eol) {
                /* delete EOL */
-               array_delete(&parser->root_list,
-                            array_count(&parser->root_list)-1, 1);
+               array_pop_back(&parser->root_list);
                parser->args_added_extra_eol = FALSE;
                parser->literal_size_return = FALSE;
        }
@@ -871,11 +870,11 @@ void imap_parser_read_last_literal(struct imap_parser *parser)
        i_assert(parser->literal_size == last_arg->_data.literal_size);
 
        /* delete EOL */
-       array_delete(&parser->root_list, array_count(&parser->root_list)-1, 1);
+       array_pop_back(&parser->root_list);
        parser->args_added_extra_eol = FALSE;
 
        /* delete literal size */
-       array_delete(list, array_count(list)-1, 1);
+       array_pop_back(list);
        parser->literal_size_return = FALSE;
 }
 

diff --git a/src/lib-index/mail-index-strmap.c b/src/lib-index/mail-index-strmap.c
index 7c66e9b80538003538b6e0260884d251c98845ff..d5cf97b8080efddda874662e4764bde58e190215 100644 (file)
--- a/src/lib-index/mail-index-strmap.c
+++ b/src/lib-index/mail-index-strmap.c
@@ -813,7 +813,7 @@ mail_index_strmap_zero_terminate(struct mail_index_strmap_view *view)
 {
        /* zero-terminate the records array */
        array_append_zero(&view->recs);
-       array_delete(&view->recs, array_count(&view->recs)-1, 1);
+       array_pop_back(&view->recs);
 }
 
 static void mail_index_strmap_view_renumber(struct mail_index_strmap_view *view)
@@ -1239,7 +1239,7 @@ void mail_index_strmap_view_sync_commit(struct mail_index_strmap_view_sync **_sy
 
        /* zero-terminate the records array */
        array_append_zero(&view->recs);
-       array_delete(&view->recs, array_count(&view->recs)-1, 1);
+       array_pop_back(&view->recs);
 }
 
 void mail_index_strmap_view_sync_rollback(struct mail_index_strmap_view_sync **_sync)

diff --git a/src/lib-index/mail-index.c b/src/lib-index/mail-index.c
index 6eb0b872e61c666a2777cc7067d068a4c009b6d2..0daf8cf9ca3cb54e37f0be9b67efee6061c2af7a 100644 (file)
--- a/src/lib-index/mail-index.c
+++ b/src/lib-index/mail-index.c
@@ -390,7 +390,7 @@ void mail_index_keyword_lookup_or_create(struct mail_index *index,
 
        /* keep the array NULL-terminated, but the NULL itself invisible */
        array_append_zero(&index->keywords);
-       array_delete(&index->keywords, array_count(&index->keywords)-1, 1);
+       array_pop_back(&index->keywords);
 }
 
 const ARRAY_TYPE(keywords) *mail_index_get_keywords(struct mail_index *index)

diff --git a/src/lib-storage/index/dbox-multi/mdbox-save.c b/src/lib-storage/index/dbox-multi/mdbox-save.c
index 25e6a2d4f4a8e1c4ff99d18d2aa34be997f37907..a6368577dca1331e6277f5099861d6aa4de16895 100644 (file)
--- a/src/lib-storage/index/dbox-multi/mdbox-save.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-save.c
@@ -217,7 +217,7 @@ static int mdbox_save_finish_write(struct mail_save_context *_ctx)
        if (ctx->ctx.failed) {
                index_storage_save_abort_last(&ctx->ctx.ctx, ctx->ctx.seq);
                mdbox_map_append_abort(ctx->append_ctx);
-               array_delete(&ctx->mails, array_count(&ctx->mails) - 1, 1);
+               array_pop_back(&ctx->mails);
                return -1;
        }
        return 0;

diff --git a/src/lib-storage/index/dbox-single/sdbox-save.c b/src/lib-storage/index/dbox-single/sdbox-save.c
index 8c3f78ac83ad820a10a6bd81fb089710359cb689..5ee09cb1902eb00f1ff01a1c5a049655e02d1f87 100644 (file)
--- a/src/lib-storage/index/dbox-single/sdbox-save.c
+++ b/src/lib-storage/index/dbox-single/sdbox-save.c
@@ -199,7 +199,7 @@ static int dbox_save_finish_write(struct mail_save_context *_ctx)
                dbox_file_append_rollback(&ctx->append_ctx);
                dbox_file_unlink(*files);
                dbox_file_unref(files);
-               array_delete(&ctx->files, array_count(&ctx->files) - 1, 1);
+               array_pop_back(&ctx->files);
        } else {
                dbox_file_append_checkpoint(ctx->append_ctx);
                if (dbox_file_append_commit(&ctx->append_ctx) < 0)

diff --git a/src/lib-storage/index/index-attachment.c b/src/lib-storage/index/index-attachment.c
index 293d656f6f301311316bd63b73464fd709a760c1..e31fca24b95092c571769dfb99fb2ba631944b90 100644 (file)
--- a/src/lib-storage/index/index-attachment.c
+++ b/src/lib-storage/index/index-attachment.c
@@ -148,8 +148,7 @@ index_attachment_close_ostream(struct ostream *output, bool success,
        fs_file_deinit(&attach->cur_file);
 
        if (ret < 0) {
-               array_delete(&attach->extrefs,
-                            array_count(&attach->extrefs)-1, 1);
+               array_pop_back(&attach->extrefs);
        }
        return ret;
 }

diff --git a/src/lib-storage/index/index-search-mime.c b/src/lib-storage/index/index-search-mime.c
index 40b2ca0de2addec26a9c6eea7e7a987ec2923652..80fa33f01d8d30d240b55b52fb42253061304b2a 100644 (file)
--- a/src/lib-storage/index/index-search-mime.c
+++ b/src/lib-storage/index/index-search-mime.c
@@ -513,7 +513,7 @@ static int seach_arg_mime_parts_match(struct search_mimepart_context *mpctx,
                        while (part->next == NULL) {
                                if (part->parent == NULL)
                                        break;
-                               array_delete(&mpctx->stack, array_count(&mpctx->stack)-1, 1);
+                               array_pop_back(&mpctx->stack);
                                level = array_idx_modifiable
                                        (&mpctx->stack, array_count(&mpctx->stack)-1);
                                part = part->parent;

diff --git a/src/plugins/virtual/virtual-storage.c b/src/plugins/virtual/virtual-storage.c
index cb3091703b1c9020c437fb89f9461323e0e69558..105a49b0316ff62235a9f2094142936e0df9f87f 100644 (file)
--- a/src/plugins/virtual/virtual-storage.c
+++ b/src/plugins/virtual/virtual-storage.c
@@ -495,8 +495,7 @@ static int virtual_mailbox_open(struct mailbox *box)
        if (ret == 0) {
                array_push_back(&mbox->storage->open_stack, &box->name);
                ret = virtual_mailboxes_open(mbox, box->flags);
-               array_delete(&mbox->storage->open_stack,
-                            array_count(&mbox->storage->open_stack)-1, 1);
+               array_pop_back(&mbox->storage->open_stack);
        }
        if (ret < 0) {
                virtual_mailbox_close_internal(mbox);