From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Fri, 4 Jan 2019 13:16:44 +0000 (+0200)
Subject: global: Use array_last instead of array_idx
X-Git-Tag: 2.3.6~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d07a16d87e97642c9bacbee71d04efc0ffe11c9d;p=thirdparty%2Fdovecot%2Fcore.git

global: Use array_last instead of array_idx

@@
expression E;
@@

-array_idx(E, array_count(E) - 1)
+array_last(E)

@@
expression E;
@@

-array_idx_modifiable(E, array_count(E) - 1)
+array_last_modifiable(E)
---

diff --git a/src/lib-imap/imap-parser.c b/src/lib-imap/imap-parser.c
index 08ef28ed9e..084a4347d8 100644
--- a/src/lib-imap/imap-parser.c
+++ b/src/lib-imap/imap-parser.c
@@ -554,7 +554,7 @@ static bool imap_parser_is_next_text(struct imap_parser *parser)
 	if (parser->cur_list != &parser->root_list)
 		return FALSE;
 
-	arg = array_idx(&parser->root_list, array_count(&parser->root_list)-1);
+	arg = array_last(&parser->root_list);
 	if (arg->type != IMAP_ARG_ATOM)
 		return FALSE;
 
diff --git a/src/lib-mail/test-istream-attachment.c b/src/lib-mail/test-istream-attachment.c
index ad6aeea713..ecf7f2492f 100644
--- a/src/lib-mail/test-istream-attachment.c
+++ b/src/lib-mail/test-istream-attachment.c
@@ -178,7 +178,7 @@ static int test_close_attachment_ostream(struct ostream *output, bool success,
 
 	i_assert(success);
 
-	a = array_idx_modifiable(&attachments, array_count(&attachments)-1);
+	a = array_last_modifiable(&attachments);
 	a->decoded_size = output->offset - a->buffer_offset;
 
 	if (o_stream_finish(output) < 0)
diff --git a/src/lib-storage/index/dbox-multi/mdbox-save.c b/src/lib-storage/index/dbox-multi/mdbox-save.c
index a6368577dc..1588ddb7a3 100644
--- a/src/lib-storage/index/dbox-multi/mdbox-save.c
+++ b/src/lib-storage/index/dbox-multi/mdbox-save.c
@@ -199,7 +199,7 @@ static int mdbox_save_finish_write(struct mail_save_context *_ctx)
 
 	dbox_save_end(&ctx->ctx);
 
-	mail = array_idx_modifiable(&ctx->mails, array_count(&ctx->mails) - 1);
+	mail = array_last_modifiable(&ctx->mails);
 	if (!ctx->ctx.failed) T_BEGIN {
 		if (mdbox_save_mail_write_metadata(ctx, mail) < 0)
 			ctx->ctx.failed = TRUE;
diff --git a/src/lib-storage/index/dbox-single/sdbox-save.c b/src/lib-storage/index/dbox-single/sdbox-save.c
index 5ee09cb190..b07e915d3d 100644
--- a/src/lib-storage/index/dbox-single/sdbox-save.c
+++ b/src/lib-storage/index/dbox-single/sdbox-save.c
@@ -188,7 +188,7 @@ static int dbox_save_finish_write(struct mail_save_context *_ctx)
 	}
 	dbox_save_end(&ctx->ctx);
 
-	files = array_idx_modifiable(&ctx->files, array_count(&ctx->files) - 1);
+	files = array_last_modifiable(&ctx->files);
 	if (!ctx->ctx.failed) T_BEGIN {
 		if (dbox_save_mail_write_metadata(&ctx->ctx, *files) < 0)
 			ctx->ctx.failed = TRUE;
diff --git a/src/lib-storage/index/index-search-mime.c b/src/lib-storage/index/index-search-mime.c
index 80fa33f01d..4ded8f0194 100644
--- a/src/lib-storage/index/index-search-mime.c
+++ b/src/lib-storage/index/index-search-mime.c
@@ -514,8 +514,7 @@ static int seach_arg_mime_parts_match(struct search_mimepart_context *mpctx,
 				if (part->parent == NULL)
 					break;
 				array_pop_back(&mpctx->stack);
-				level = array_idx_modifiable
-					(&mpctx->stack, array_count(&mpctx->stack)-1);
+				level = array_last_modifiable(&mpctx->stack);
 				part = part->parent;
 			}
 			level->index++;
diff --git a/src/lib-storage/mail-storage-hooks.c b/src/lib-storage/mail-storage-hooks.c
index 6573fbf16a..de35b3af5a 100644
--- a/src/lib-storage/mail-storage-hooks.c
+++ b/src/lib-storage/mail-storage-hooks.c
@@ -59,8 +59,7 @@ void mail_storage_hooks_add_forced(struct module *module,
 	struct mail_storage_module_hooks *hook;
 
 	mail_storage_hooks_add(module, hooks);
-	hook = array_idx_modifiable(&module_hooks,
-				    array_count(&module_hooks)-1);
+	hook = array_last_modifiable(&module_hooks);
 	hook->forced = TRUE;
 }