lib-index: Use array_foreach_elem() where possible

diff --git a/src/lib-index/mail-index-fsck.c b/src/lib-index/mail-index-fsck.c
index d8eb0bf3cc818939cfeb5fe8b9c86ad87904dad4..6636edf2c688c60876f7157626af1757df41c85e 100644 (file)
--- a/src/lib-index/mail-index-fsck.c
+++ b/src/lib-index/mail-index-fsck.c
@@ -83,10 +83,10 @@ mail_index_fsck_header(struct mail_index *index, struct mail_index_map *map,
 static bool
 array_has_name(const ARRAY_TYPE(const_string) *names, const char *name)
 {
-       const char *const *namep;
+       const char *arr_name;
 
-       array_foreach(names, namep) {
-               if (strcmp(*namep, name) == 0)
+       array_foreach_elem(names, arr_name) {
+               if (strcmp(arr_name, name) == 0)
                        return TRUE;
        }
        return FALSE;

diff --git a/src/lib-index/mail-index-transaction.c b/src/lib-index/mail-index-transaction.c
index 0ae6c20791c7d755a999645f4fcfea7bdaf8b130..fd21b5c39690db514fb17abd50777bc3e7883036 100644 (file)
--- a/src/lib-index/mail-index-transaction.c
+++ b/src/lib-index/mail-index-transaction.c
@@ -357,9 +357,9 @@ mail_index_transaction_begin(struct mail_index_view *view,
        if (array_is_created(&hook_mail_index_transaction_created)) {
                struct hook_build_context *ctx =
                        hook_build_init((void *)&t->v, sizeof(t->v));
-               hook_mail_index_transaction_created_t *const *ptr;
-               array_foreach(&hook_mail_index_transaction_created, ptr) {
-                       (*ptr)(t);
+               hook_mail_index_transaction_created_t *callback;
+               array_foreach_elem(&hook_mail_index_transaction_created, callback) {
+                       callback(t);
                        hook_build_update(ctx, t->vlast);
                }
                t->vlast = NULL;