From 92f3d3238a6deedb8015227f18df9f0e574b5200 Mon Sep 17 00:00:00 2001 From: Timo Sirainen <timo.sirainen@dovecot.fi> Date: Wed, 22 Feb 2017 13:36:26 +0200 Subject: [PATCH] global: Replace mail_storage_service_user_free() with _unref() --- src/lib-sieve-tool/sieve-tool.c | 2 +- src/managesieve/main.c | 2 +- src/managesieve/managesieve-client.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c index 7231b6673..a83dc6f78 100644 --- a/src/lib-sieve-tool/sieve-tool.c +++ b/src/lib-sieve-tool/sieve-tool.c @@ -332,7 +332,7 @@ void sieve_tool_deinit(struct sieve_tool **_tool) if ( tool->mail_user_dovecot != NULL ) mail_user_unref(&tool->mail_user_dovecot); - mail_storage_service_user_free(&tool->service_user); + mail_storage_service_user_unref(&tool->service_user); mail_storage_service_deinit(&tool->storage_service); /* Free sieve tool object */ diff --git a/src/managesieve/main.c b/src/managesieve/main.c index 93eb9e24e..ef66f427c 100644 --- a/src/managesieve/main.c +++ b/src/managesieve/main.c @@ -143,7 +143,7 @@ client_create_from_input(const struct mail_storage_service_input *input, if (settings_var_expand(&managesieve_setting_parser_info, set, mail_user->pool, mail_user_var_expand_table(mail_user), &error) <= 0) { i_error("Failed to expand settings: %s", error); - mail_storage_service_user_free(&user); + mail_storage_service_user_unref(&user); mail_user_unref(&mail_user); return -1; } diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c index 7a9c0ddcc..d8827b3a2 100644 --- a/src/managesieve/managesieve-client.c +++ b/src/managesieve/managesieve-client.c @@ -278,7 +278,7 @@ void client_destroy(struct client *client, const char *reason) sieve_deinit(&client->svinst); pool_unref(&client->cmd.pool); - mail_storage_service_user_free(&client->service_user); + mail_storage_service_user_unref(&client->service_user); managesieve_client_count--; DLLIST_REMOVE(&managesieve_clients, client); -- GitLab