global: Use array_pop_front

@@
expression A;
@@

-array_delete(A, 0, 1)
+array_pop_front(A)

diff --git a/src/doveadm/doveadm-mail-server.c b/src/doveadm/doveadm-mail-server.c
index af06d4234035a48333c89f3d65ffde6207cfaab5..b87c45871edc4a1515460b82f548597ddf3785a3 100644 (file)
--- a/src/doveadm/doveadm-mail-server.c
+++ b/src/doveadm/doveadm-mail-server.c
@@ -124,7 +124,7 @@ static void doveadm_cmd_callback(int exit_code, const char *error,
 
                conn = doveadm_server_find_unused_conn(server);
                if (conn != NULL) {
-                       array_delete(&server->queue, 0, 1);
+                       array_pop_front(&server->queue);
                        doveadm_mail_server_handle(conn, username);
                        i_free(username);
                }

diff --git a/src/doveadm/dsync/dsync-ibc-pipe.c b/src/doveadm/dsync/dsync-ibc-pipe.c
index 3d6d2b72e0f92b6c962f5f418e10b2f51cefd2e5..d965478a66eb850e9b6e7e5c04bc13601b11f3ed 100644 (file)
--- a/src/doveadm/dsync/dsync-ibc-pipe.c
+++ b/src/doveadm/dsync/dsync-ibc-pipe.c
@@ -114,7 +114,7 @@ dsync_ibc_pipe_pop_item(struct dsync_ibc_pipe *pipe, enum item_type type)
        item = array_first_modifiable(&pipe->item_queue);
        i_assert(item->type == type);
        pipe->pop_item = *item;
-       array_delete(&pipe->item_queue, 0, 1);
+       array_pop_front(&pipe->item_queue);
        item = NULL;
 
        pool_unref(&pipe->pop_pool);
@@ -133,7 +133,7 @@ static bool dsync_ibc_pipe_try_pop_eol(struct dsync_ibc_pipe *pipe)
        if (item->type != ITEM_END_OF_LIST)
                return FALSE;
 
-       array_delete(&pipe->item_queue, 0, 1);
+       array_pop_front(&pipe->item_queue);
        return TRUE;
 }
 

diff --git a/src/lib-dict/dict-memcached-ascii.c b/src/lib-dict/dict-memcached-ascii.c
index 088365d02a394c9e65ad5edff98f6558b1612d3c..8f7e837cb0571caf61416447952ab7340ef17dc0 100644 (file)
--- a/src/lib-dict/dict-memcached-ascii.c
+++ b/src/lib-dict/dict-memcached-ascii.c
@@ -213,14 +213,14 @@ static int memcached_ascii_input_reply(struct memcached_ascii_dict *dict,
        if ((ret = memcached_ascii_input_reply_read(dict, error_r)) <= 0)
                return ret;
        /* finished a reply */
-       array_delete(&dict->input_states, 0, 1);
+       array_pop_front(&dict->input_states);
 
        replies = array_get_modifiable(&dict->replies, &count);
        i_assert(count > 0);
        i_assert(replies[0].reply_count > 0);
        if (--replies[0].reply_count == 0) {
                memcached_ascii_callback(dict, &replies[0], &result);
-               array_delete(&dict->replies, 0, 1);
+               array_pop_front(&dict->replies);
        }
        return 1;
 }

diff --git a/src/lib-dict/dict-redis.c b/src/lib-dict/dict-redis.c
index 2415874f6341f72c45479624652af29ebe2655c2..0888f70d3d06c3d4abb5f792599ea0d020893ccd 100644 (file)
--- a/src/lib-dict/dict-redis.c
+++ b/src/lib-dict/dict-redis.c
@@ -77,7 +77,7 @@ redis_input_state_add(struct redis_dict *dict, enum redis_input_state state)
 
 static void redis_input_state_remove(struct redis_dict *dict)
 {
-       array_delete(&dict->input_states, 0, 1);
+       array_pop_front(&dict->input_states);
 }
 
 static void redis_callback(struct redis_dict *dict,
@@ -266,7 +266,7 @@ redis_conn_input_more(struct redis_connection *conn, const char **error_r)
                                DICT_COMMIT_RET_OK, NULL
                        };
                        redis_callback(dict, reply, &result);
-                       array_delete(&dict->replies, 0, 1);
+                       array_pop_front(&dict->replies);
                        /* if we're running in a dict-ioloop, we're handling a
                           synchronous commit and need to stop now */
                        if (array_count(&dict->replies) == 0 &&

diff --git a/src/lib-http/http-client-connection.c b/src/lib-http/http-client-connection.c
index 3fe3cfe209cfb5bad2d48ac82c87e3791a18dc7c..1e290bb9b0ca4cb0ff7a35c7290be8103eb9b13e 100644 (file)
--- a/src/lib-http/http-client-connection.c
+++ b/src/lib-http/http-client-connection.c
@@ -1116,7 +1116,7 @@ static void http_client_connection_input(struct connection *_conn)
                }
 
                /* remove request from queue */
-               array_delete(&conn->request_wait_list, 0, 1);
+               array_pop_front(&conn->request_wait_list);
                aborted = (req->state == HTTP_REQUEST_STATE_ABORTED);
                req_ref = req;
                if (!http_client_connection_unref_request(conn, &req_ref)) {

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 006c941f8594250e40e18484ad0768c97ddb8643..cffb00685e8024d812cebf9cf98b34efd93197d3 100644 (file)
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -1453,7 +1453,7 @@ static int imapc_connection_input_tagged(struct imapc_connection *conn)
        cmds = array_get(&conn->cmd_send_queue, &count);
        if (count > 0 && cmds[0]->tag == conn->cur_tag) {
                cmd = cmds[0];
-               array_delete(&conn->cmd_send_queue, 0, 1);
+               array_pop_front(&conn->cmd_send_queue);
        } else {
                cmds = array_get(&conn->cmd_wait_list, &count);
                for (i = 0; i < count; i++) {
@@ -2033,7 +2033,7 @@ static void imapc_command_send_finished(struct imapc_connection *conn,
        /* everything sent. move command to wait list. */
        cmdp = array_first(&conn->cmd_send_queue);
        i_assert(*cmdp == cmd);
-       array_delete(&conn->cmd_send_queue, 0, 1);
+       array_pop_front(&conn->cmd_send_queue);
        array_push_back(&conn->cmd_wait_list, &cmd);
 
        /* send the next command in queue */
@@ -2090,7 +2090,7 @@ static int imapc_command_try_send_stream(struct imapc_connection *conn,
 
        /* finished with the stream */
        i_stream_unref(&stream->input);
-       array_delete(&cmd->streams, 0, 1);
+       array_pop_front(&cmd->streams);
 
        i_assert(cmd->send_pos != cmd->data->used);
        return 1;
@@ -2194,7 +2194,7 @@ static void imapc_command_send_more(struct imapc_connection *conn)
                reply.text_without_resp = reply.text_full = "Mailbox not open";
                reply.state = IMAPC_COMMAND_STATE_DISCONNECTED;
 
-               array_delete(&conn->cmd_send_queue, 0, 1);
+               array_pop_front(&conn->cmd_send_queue);
                imapc_command_reply_free(cmd, &reply);
                imapc_command_send_more(conn);
                return;
@@ -2220,7 +2220,7 @@ static void imapc_command_send_more(struct imapc_connection *conn)
                reply.text_without_resp = reply.text_full = "Mailbox not open";
                reply.state = IMAPC_COMMAND_STATE_DISCONNECTED;
 
-               array_delete(&conn->cmd_send_queue, 0, 1);
+               array_pop_front(&conn->cmd_send_queue);
                imapc_command_reply_free(cmd, &reply);
                imapc_command_send_more(conn);
                return;

diff --git a/src/lib-imap-client/test-imapc-client.c b/src/lib-imap-client/test-imapc-client.c
index 0aa9b95d9b4eea6c37952a9d1ebd6a103e3a9297..4f4da355ccaf96f1e9e49665b1061428e900a652 100644 (file)
--- a/src/lib-imap-client/test-imapc-client.c
+++ b/src/lib-imap-client/test-imapc-client.c
@@ -179,7 +179,7 @@ static enum imapc_command_state test_imapc_cmd_last_reply_pop(void)
        if (count == 0)
                return IMAPC_COMMAND_STATE_INVALID;
        reply = replies[0];
-       array_delete(&imapc_cmd_last_replies, 0, 1);
+       array_pop_front(&imapc_cmd_last_replies);
        return reply;
 }
 

diff --git a/src/lib-smtp/smtp-client-command.c b/src/lib-smtp/smtp-client-command.c
index 47bf6b68636ff8e0451eee54ff3ed8be26e76672..21f66cd261a2282f0a4c8ef28610be08e5519a82 100644 (file)
--- a/src/lib-smtp/smtp-client-command.c
+++ b/src/lib-smtp/smtp-client-command.c
@@ -1264,7 +1264,7 @@ static void _cmd_bdat_cb(const struct smtp_reply *reply,
        }
 
        /* drop the command from the list */
-       array_delete(&ctx->cmds, 0, 1);
+       array_pop_front(&ctx->cmds);
 
        /* send more BDAT commands if necessary */
        (void)_cmd_bdat_send_chunks(ctx, NULL);

diff --git a/src/lib-sql/driver-test.c b/src/lib-sql/driver-test.c
index ea718e682f53d0ec6049f1b0bed430778ec2d406..aa6cfec0083847602ef0db63719c298148a28fb8 100644 (file)
--- a/src/lib-sql/driver-test.c
+++ b/src/lib-sql/driver-test.c
@@ -297,7 +297,7 @@ driver_test_query_s(struct sql_db *_db, const char *query)
 
        /* drop it from array if it's used up */
        if (result->cur == result->nqueries)
-               array_delete(&db->expected, 0, 1);
+               array_pop_front(&db->expected);
 
        return &res->api;
 }
@@ -361,7 +361,7 @@ driver_test_update(struct sql_transaction_context *ctx, const char *query,
 
        /* drop it from array if it's used up */
        if (result->cur == result->nqueries)
-               array_delete(&db->expected, 0, 1);
+               array_pop_front(&db->expected);
 }
 
 static const char *

diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c
index 46dc4f9c98c2fb01eceb1f0033990701b1eec100..8092174420f985f65246d36ed5aa8c595b35fdfa 100644 (file)
--- a/src/lib-storage/index/pop3c/pop3c-client.c
+++ b/src/lib-storage/index/pop3c/pop3c-client.c
@@ -163,7 +163,7 @@ pop3c_client_async_callback(struct pop3c_client *client,
                return;
        }
        cmd_copy = *cmd;
-       array_delete(&client->commands, 0, 1);
+       array_pop_front(&client->commands);
 
        if (cmd_copy.input != NULL) {
                i_stream_seek(cmd_copy.input, 0);

diff --git a/src/plugins/quota/quota-imapc.c b/src/plugins/quota/quota-imapc.c
index ddfb862758281b3faed158b4f4dcad0ace2961bc..4a1be1be713066ef1483e0f3d2c9c85fd8e74ae2 100644 (file)
--- a/src/plugins/quota/quota-imapc.c
+++ b/src/plugins/quota/quota-imapc.c
@@ -351,7 +351,7 @@ static int imapc_quota_refresh_root(struct imapc_quota_root *root,
                        array_first(&root->refresh.roots);
                if (strcmp(refresh_root->name, root->root_name) == 0)
                        break;
-               array_delete(&root->refresh.roots, 0, 1);
+               array_pop_front(&root->refresh.roots);
        }
        imapc_quota_refresh_deinit(root->root.quota, &root->refresh,
                                   sctx.ret == 0);