]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: Use array_pop_front
authorAki Tuomi <aki.tuomi@open-xchange.com>
Fri, 11 Jan 2019 10:41:48 +0000 (12:41 +0200)
committerTimo Sirainen <timo.sirainen@open-xchange.com>
Tue, 2 Apr 2019 07:22:55 +0000 (10:22 +0300)
Re-run of 9b726934956ed9ca02077a82f7b2a1d74b7c9146 due to
bad spatch usage.

src/director/director-request.c
src/lib-storage/index/index-search.c
src/lib/seq-range-array.c

index f241330eb8b6608107d78a6fbcb5395f7eec5630..7e11a21478d49f3da2f724122502625e89fa9be2 100644 (file)
@@ -115,7 +115,7 @@ static void director_request_timeout(struct director *dir)
                i_assert(dir->requests_delayed_count > 0);
                dir->requests_delayed_count--;
 
-               array_delete(&dir->pending_requests, 0, 1);
+               array_pop_front(&dir->pending_requests);
                T_BEGIN {
                        request->callback(NULL, NULL, errormsg, request->context);
                } T_END;
index 42328500aa44b53d6dabe61febbded202c6ba6f0..f1729af243d4610ff979805dc2bd1173cf6c5012 100644 (file)
@@ -1743,7 +1743,7 @@ static int search_more_with_prefetching(struct index_search_context *ctx,
        mails = array_get(&ctx->mails, &count);
        *mail_r = mails[0];
        if (--ctx->unused_mail_idx > 0) {
-               array_delete(&ctx->mails, 0, 1);
+               array_pop_front(&ctx->mails);
                array_push_back(&ctx->mails, mail_r);
        }
        index_mail_update_access_parts_post(*mail_r);
index 6d818001c7dfad829b2d0cce1a51256ed29b4ed4..a5a6d870d349979c7bc0cc10882ca9357d36d01d 100644 (file)
@@ -245,7 +245,7 @@ bool seq_range_array_remove(ARRAY_TYPE(seq_range) *array, uint32_t seq)
                if (data[0].seq1 != data[0].seq2)
                        data[0].seq1++;
                else
-                       array_delete(array, 0, 1);
+                       array_pop_front(array);
                return TRUE;
        }