global: Replace mail_storage_service_user_free() with _unref()

diff --git a/src/doveadm/doveadm-auth-server.c b/src/doveadm/doveadm-auth-server.c
index 2d7ec8380d20b5a0c70b5328490fa9e9d130a7d9..8850d3e8750996a4138f02b7d1d8f6ecf31d7f4f 100644 (file)
--- a/src/doveadm/doveadm-auth-server.c
+++ b/src/doveadm/doveadm-auth-server.c
@@ -343,7 +343,7 @@ cmd_user_mail_input(struct mail_storage_service_ctx *storage_service,
        }
 
        mail_user_unref(&user);
-       mail_storage_service_user_free(&service_user);
+       mail_storage_service_user_unref(&service_user);
        pool_unref(&pool);
        return 1;
 }

diff --git a/src/doveadm/doveadm-auth.c b/src/doveadm/doveadm-auth.c
index 62f2510fa56940c8dc023d41c6b205bf16a558f1..d8205939c8be7e6ab4af499454594045a021c0b6 100644 (file)
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -586,7 +586,7 @@ cmd_user_mail_input(struct mail_storage_service_ctx *storage_service,
        }
 
        mail_user_unref(&user);
-       mail_storage_service_user_free(&service_user);
+       mail_storage_service_user_unref(&service_user);
        pool_unref(&pool);
        return 1;
 }

diff --git a/src/doveadm/doveadm-mail-copymove.c b/src/doveadm/doveadm-mail-copymove.c
index dee73f2c6b1be94fab744c3c465fb01556f0d8da..2cc2f5b6e764485dbecb22d4faa279e8b2304943 100644 (file)
--- a/src/doveadm/doveadm-mail-copymove.c
+++ b/src/doveadm/doveadm-mail-copymove.c
@@ -165,7 +165,7 @@ static void cmd_copy_deinit(struct doveadm_mail_cmd_context *_ctx)
        struct copy_cmd_context *ctx = (struct copy_cmd_context *)_ctx;
 
        if (ctx->source_user != NULL) {
-               mail_storage_service_user_free(&ctx->source_service_user);
+               mail_storage_service_user_unref(&ctx->source_service_user);
                mail_user_unref(&ctx->source_user);
        }
 }

diff --git a/src/doveadm/doveadm-mail-import.c b/src/doveadm/doveadm-mail-import.c
index 9235046bb78c2c572d94efad4361d0a3ed4867c5..50d13b657a7bba4a926bce3cf8f7a3438fa06a61 100644 (file)
--- a/src/doveadm/doveadm-mail-import.c
+++ b/src/doveadm/doveadm-mail-import.c
@@ -177,7 +177,7 @@ static void cmd_import_init_source_user(struct import_cmd_context *ctx, struct m
                i_fatal("Import namespace initialization failed: %s", error);
 
        ctx->src_user = user;
-       mail_storage_service_user_free(&service_user);
+       mail_storage_service_user_unref(&service_user);
 }
 
 static int

diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 4abdb9a132b1ae70aa639e9aefeb0456466b7616..5243896675f98732f7ac524f2e35e9dff2045395 100644 (file)
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -391,7 +391,7 @@ doveadm_mail_next_user(struct doveadm_mail_cmd_context *ctx,
 
        if (ctx->v.prerun != NULL) {
                if (ctx->v.prerun(ctx, ctx->cur_service_user, error_r) < 0) {
-                       mail_storage_service_user_free(&ctx->cur_service_user);
+                       mail_storage_service_user_unref(&ctx->cur_service_user);
                        return -1;
                }
        }
@@ -401,7 +401,7 @@ doveadm_mail_next_user(struct doveadm_mail_cmd_context *ctx,
                                        &ctx->cur_mail_user);
        if (ret < 0) {
                *error_r = "User init failed";
-               mail_storage_service_user_free(&ctx->cur_service_user);
+               mail_storage_service_user_unref(&ctx->cur_service_user);
                return ret;
        }
 
@@ -409,7 +409,7 @@ doveadm_mail_next_user(struct doveadm_mail_cmd_context *ctx,
                i_assert(ctx->exit_code != 0);
        }
        mail_user_unref(&ctx->cur_mail_user);
-       mail_storage_service_user_free(&ctx->cur_service_user);
+       mail_storage_service_user_unref(&ctx->cur_service_user);
        return 1;
 }
 

diff --git a/src/imap-urlauth/imap-urlauth-worker.c b/src/imap-urlauth/imap-urlauth-worker.c
index b3756a539f571e89d5c7661fd91ba8640aa296ad..8df68a6a3c61add7e1bddc225a8712fc55e9f382 100644 (file)
--- a/src/imap-urlauth/imap-urlauth-worker.c
+++ b/src/imap-urlauth/imap-urlauth-worker.c
@@ -260,7 +260,7 @@ static void client_destroy(struct client *client)
                net_disconnect(client->fd_ctrl);
 
        if (client->service_user != NULL)
-               mail_storage_service_user_free(&client->service_user);
+               mail_storage_service_user_unref(&client->service_user);
        i_free(client->access_user);
        array_foreach_modifiable(&client->access_apps, app)
                i_free(*app);

diff --git a/src/imap/imap-client.c b/src/imap/imap-client.c
index 83ceeda4d0caa8a1e0ceba922a6ceaf494a7d4df..1158253b61d3a57296ccd074c71eab8127fefe11 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -467,7 +467,7 @@ static void client_default_destroy(struct client *client, const char *reason)
        if (array_is_created(&client->search_updates))
                array_free(&client->search_updates);
        pool_unref(&client->command_pool);
-       mail_storage_service_user_free(&client->service_user);
+       mail_storage_service_user_unref(&client->service_user);
 
        imap_client_count--;
        DLLIST_REMOVE(&imap_clients, client);

diff --git a/src/imap/main.c b/src/imap/main.c
index ebe422ca87796888155d4bdfed605e2a5e56ecdc..050692eebd214cb669a6d0dea6a0cca16ae74c60 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -242,7 +242,7 @@ int client_create_from_input(const struct mail_storage_service_input *input,
        if (mail_error != MAIL_ERROR_NONE) {
                *error_r = t_strdup(errstr);
                mail_user_unref(&mail_user);
-               mail_storage_service_user_free(&user);
+               mail_storage_service_user_unref(&user);
                return -1;
        }
 

diff --git a/src/indexer/master-connection.c b/src/indexer/master-connection.c
index 26cbdc6deaf0ef0c71525e3d8612b09d98b6895a..aab4def2f1100f7ee143b73eebc85cabcea2628f 100644 (file)
--- a/src/indexer/master-connection.c
+++ b/src/indexer/master-connection.c
@@ -229,7 +229,7 @@ master_connection_input_line(struct master_connection *conn, const char *line)
                                    max_recent_msgs, args[4]);
                indexer_worker_refresh_proctitle(NULL, NULL, 0, 0);
                mail_user_unref(&user);
-               mail_storage_service_user_free(&service_user);
+               mail_storage_service_user_unref(&service_user);
        }
 
        str = ret < 0 ? "-1\n" : "100\n";

diff --git a/src/lda/main.c b/src/lda/main.c
index 7a84b53280cf9704f1a3a009358798aee53caad2..7c8c17d73de4373ab9b7d3c2fb9d527dec8444aa 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -491,7 +491,7 @@ int main(int argc, char *argv[])
        mail_user_unref(&ctx.dest_user);
        mail_deliver_session_deinit(&ctx.session);
 
-       mail_storage_service_user_free(&service_user);
+       mail_storage_service_user_unref(&service_user);
        mail_storage_service_deinit(&storage_service);
        master_service_deinit(&master_service);
         return EX_OK;

diff --git a/src/lmtp/client.c b/src/lmtp/client.c
index 2d258cb4489488171bcea220d89149a65effdb9f..339b72f6789b3521114e3ce8776fea39becc42c5 100644 (file)
--- a/src/lmtp/client.c
+++ b/src/lmtp/client.c
@@ -366,7 +366,7 @@ void client_state_reset(struct client *client, const char *state_name)
                        if ((*rcptp)->anvil_query != NULL)
                                anvil_client_query_abort(anvil, &(*rcptp)->anvil_query);
                        client_rcpt_anvil_disconnect(*rcptp);
-                       mail_storage_service_user_free(&(*rcptp)->service_user);
+                       mail_storage_service_user_unref(&(*rcptp)->service_user);
                }
        }
 

diff --git a/src/lmtp/commands.c b/src/lmtp/commands.c
index bf1b9bb346e7d96e2131a603affe081e73696e52..a61d87803fe2074d5997dc267f094e88346e8db3 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -604,7 +604,7 @@ static bool cmd_rcpt_finish(struct client *client, struct mail_recipient *rcpt)
                        client_send_line(client, ERRSTR_TEMP_MAILBOX_FAIL,
                                         rcpt->address);
                }
-               mail_storage_service_user_free(&rcpt->service_user);
+               mail_storage_service_user_unref(&rcpt->service_user);
                return FALSE;
        }
        array_append(&client->state.rcpt_to, &rcpt, 1);
@@ -630,7 +630,7 @@ static void rcpt_anvil_lookup_callback(const char *reply, void *context)
                client_send_line(client, ERRSTR_TEMP_USERDB_FAIL_PREFIX
                                 "Too many concurrent deliveries for user",
                                 rcpt->address);
-               mail_storage_service_user_free(&rcpt->service_user);
+               mail_storage_service_user_unref(&rcpt->service_user);
        } else if (cmd_rcpt_finish(client, rcpt)) {
                rcpt->anvil_connect_sent = TRUE;
                input = mail_storage_service_user_get_input(rcpt->service_user);
@@ -728,7 +728,7 @@ int cmd_rcpt(struct client *client, const char *args)
                client_send_line(client, "451 4.3.0 <%s> "
                        "Can't handle mixed proxy/non-proxy destinations",
                        address);
-               mail_storage_service_user_free(&rcpt->service_user);
+               mail_storage_service_user_unref(&rcpt->service_user);
                return 0;
        }
 

diff --git a/src/plugins/mail-crypt/doveadm-mail-crypt.c b/src/plugins/mail-crypt/doveadm-mail-crypt.c
index 4ab8288efa8058f1b9325802be15148f87d3f6d0..b2f358ca429f95ec65dcfe31417c9ce77354c0ae 100644 (file)
--- a/src/plugins/mail-crypt/doveadm-mail-crypt.c
+++ b/src/plugins/mail-crypt/doveadm-mail-crypt.c
@@ -152,7 +152,7 @@ mcp_update_shared_key(struct mailbox_transaction_context *t,
        mail_storage_service_io_activate_user(dest_service_user);
 
        mail_user_unref(&dest_user);
-       mail_storage_service_user_free(&dest_service_user);
+       mail_storage_service_user_unref(&dest_service_user);
 
        if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
                io_loop_context_deactivate(cur_ioloop_ctx);

diff --git a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
index af6c7e1b71cbddd1ff3d875662e40d353a85d888..8c3604873802281875017f0ff71f3b06283eff8a 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
@@ -304,7 +304,7 @@ static int mail_crypt_acl_object_update(struct acl_object *aclobj,
                mail_storage_service_io_activate_user(dest_service_user);
 
                mail_user_unref(&dest_user);
-               mail_storage_service_user_free(&dest_service_user);
+               mail_storage_service_user_unref(&dest_service_user);
 
                if ((cur_ioloop_ctx = io_loop_get_current_context(current_ioloop)) != NULL)
                        io_loop_context_deactivate(cur_ioloop_ctx);

diff --git a/src/plugins/mail-crypt/test-mail-key.c b/src/plugins/mail-crypt/test-mail-key.c
index d0c719477a1d7454521eb68677556cdd9c2aa4c0..a2299c0c0ee4490c2699c65d4c055404e36dd90a 100644 (file)
--- a/src/plugins/mail-crypt/test-mail-key.c
+++ b/src/plugins/mail-crypt/test-mail-key.c
@@ -192,7 +192,7 @@ static
 void deinit_test_mail_user()
 {
        mail_user_unref(&test_mail_user);
-       mail_storage_service_user_free(&test_service_user);
+       mail_storage_service_user_unref(&test_service_user);
        mail_storage_service_deinit(&mail_storage_service);
        if (unlink_directory(mail_home, UNLINK_DIRECTORY_FLAG_RMDIR) < 0)
                i_error("unlink_directory(%s) failed", mail_home);

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index 07c84b7ba687073fffd43bce6aa60e14ca187c02..61a3510b3b3a9078144fa63a4c605b5af3d0713b 100644 (file)
--- a/src/plugins/quota/quota-status.c
+++ b/src/plugins/quota/quota-status.c
@@ -116,7 +116,7 @@ static void client_handle_request(struct quota_client *client)
                }
                value = t_strdup(value); /* user's pool is being freed */
                mail_user_unref(&user);
-               mail_storage_service_user_free(&service_user);
+               mail_storage_service_user_unref(&service_user);
        }
        if (ret < 0) {
                /* temporary failure */

diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index 5772249ad349f3af8336c4f3c4c777a2aae4d789..04c8efc55cad08f705deb484cb7f6dcc62f22dde 100644 (file)
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -643,7 +643,7 @@ static void client_default_destroy(struct client *client, const char *reason)
        o_stream_destroy(&client->output);
 
        fd_close_maybe_stdio(&client->fd_in, &client->fd_out);
-       mail_storage_service_user_free(&client->service_user);
+       mail_storage_service_user_unref(&client->service_user);
 
        pop3_client_count--;
        DLLIST_REMOVE(&pop3_clients, client);