From: Aki Tuomi Date: Fri, 4 Jan 2019 12:01:53 +0000 (+0200) Subject: global: Use array_pop_back X-Git-Tag: 2.3.6~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4bf2365241a8306f1b912b3c125fa0c7c6a32b6a;p=thirdparty%2Fdovecot%2Fcore.git 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 3e5d7211b8..2fcd5fdef1 100644 --- 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(¶m->value.v_array)) { array_append_zero(¶m->value.v_array); - array_delete(¶m->value.v_array, array_count(¶m->value.v_array)-1, 1); + array_pop_back(¶m->value.v_array); } } } diff --git a/src/imap/imap-fetch.c b/src/imap/imap-fetch.c index 3fe515eccf..23bf17167b 100644 --- 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 733101d4d4..5f0f8e30a1 100644 --- 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 8e9b36e075..08ef28ed9e 100644 --- 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 7c66e9b805..d5cf97b808 100644 --- 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 6eb0b872e6..0daf8cf9ca 100644 --- 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 25e6a2d4f4..a6368577dc 100644 --- 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 8c3f78ac83..5ee09cb190 100644 --- 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 293d656f6f..e31fca24b9 100644 --- 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 40b2ca0de2..80fa33f01d 100644 --- 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 cb3091703b..105a49b031 100644 --- 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);