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 b27486b99caf4d9d811603b050f70c77f8357f23..25492084094edb3e0e60e8cb3ecb32ca87309c32 100644 (file)
--- a/src/doveadm/doveadm-auth-server.c
+++ b/src/doveadm/doveadm-auth-server.c
@@ -351,7 +351,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 4747fb3fd01419b6daa3bd7855bbe36d5fc773a4..130a109ea89f01d5144b3acf9ab894b979b3a0dd 100644 (file)
--- a/src/doveadm/doveadm-auth.c
+++ b/src/doveadm/doveadm-auth.c
@@ -590,7 +590,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 0fd7f998bb4886793ea93ab126b3c967093f2cc4..c0b9e6be12ce9b0ae8243a16ae8b7f87491b6d12 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;
                }
        }
@@ -400,7 +400,7 @@ doveadm_mail_next_user(struct doveadm_mail_cmd_context *ctx,
                                        ctx->cur_service_user,
                                        &ctx->cur_mail_user, error_r);
        if (ret < 0) {
-               mail_storage_service_user_free(&ctx->cur_service_user);
+               mail_storage_service_user_unref(&ctx->cur_service_user);
                return ret;
        }
 
@@ -408,7 +408,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 ed0470ade7b61e922c8389e7c6e361724d5c30b3..a3c9e8938f3dee150803921ac88a98f90644f737 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 83a2fa5ae728d9870e82e46b35314e06373d217e..b99fc5ad0f7396cb99a551431023f632b0207eca 100644 (file)
--- a/src/imap/imap-client.c
+++ b/src/imap/imap-client.c
@@ -462,7 +462,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 6ef5f6edafd66fe7e94259a7ff08fb2c122c176e..eaf7ff5ae37a78be36a18624e91ca8f48b7d7946 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;
        }
 
@@ -259,7 +259,7 @@ int client_create_from_input(const struct mail_storage_service_input *input,
                                &errstr) <= 0) {
                *error_r = t_strdup_printf("Failed to expand settings: %s", 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 d1cbd193dbd9efc99d2d3df6da85941f24edbbbc..680d6bc13a03675ce13197e70bf089eba26be8d4 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 01ef837dcae0072e266cb6c7e0491494fbeaf624..3163d24851af2fa15f4c5df8ca0e0d046bdda5d5 100644 (file)
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -497,7 +497,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 1dc0b96594f257b6d72ba5e1d3717d4fed24d771..ad29a3971f027ae7679b8d401d654837b006a32c 100644 (file)
--- a/src/lmtp/client.c
+++ b/src/lmtp/client.c
@@ -369,7 +369,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 2d900c89da95535cb2eda9d2d78fda19b8cea2a6..e87e195d2741fa47089aa2f0ddb55faa1f47f237 100644 (file)
--- a/src/lmtp/commands.c
+++ b/src/lmtp/commands.c
@@ -614,7 +614,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);
@@ -640,7 +640,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);
@@ -738,7 +738,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 bfe31373ed62987365eaa65a85046c169f0e4dfe..c02c5e77183d69e4e21987f33ddeecb11ec6b8a6 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 ac62dc6f2d36ab3bcaf038c4665a5872cffed23c..c03fe707caf50b9a95ae4e5a0b62cbd576ddff41 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-acl-plugin.c
@@ -317,7 +317,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 5cb399cdd751339b8054858b2e376453fed3da6a..ea5d59f26d721f11d24a5f7d288bec435ef1c0f6 100644 (file)
--- a/src/plugins/mail-crypt/test-mail-key.c
+++ b/src/plugins/mail-crypt/test-mail-key.c
@@ -188,7 +188,7 @@ void deinit_test_mail_user()
 {
        const char *error;
        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,
                             &error) < 0)

diff --git a/src/plugins/quota/quota-status.c b/src/plugins/quota/quota-status.c
index cafa9f48e09b7ea5cb76ecfd094389e759b572b8..46ff0a588045c7333e3239142617cf5f8fd328fc 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);
        } else {
                i_error("Failed to lookup user %s: %s", input.username, error);
                error = "Temporary internal error";

diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index 2fe964959b59633bf05ae4f7c3b3f7ced2daf6a2..dc165003dae9bed761a019ac737b879c868bed4b 100644 (file)
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -631,7 +631,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);