From: Timo Sirainen Date: Tue, 31 Oct 2017 16:39:39 +0000 (+0200) Subject: global: Rename ssl_iostream_context_deinit() to ssl_iostream_context_unref() X-Git-Tag: 2.3.0.rc1~539 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15d19d6e4daf460d8d2c82b981e23996dbdf7ba5;p=thirdparty%2Fdovecot%2Fcore.git global: Rename ssl_iostream_context_deinit() to ssl_iostream_context_unref() --- diff --git a/src/doveadm/doveadm-dsync.c b/src/doveadm/doveadm-dsync.c index 1224052385..114639d125 100644 --- a/src/doveadm/doveadm-dsync.c +++ b/src/doveadm/doveadm-dsync.c @@ -711,7 +711,7 @@ cmd_dsync_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user) if (ctx->ssl_iostream != NULL) ssl_iostream_destroy(&ctx->ssl_iostream); if (ctx->ssl_ctx != NULL) - ssl_iostream_context_deinit(&ctx->ssl_ctx); + ssl_iostream_context_unref(&ctx->ssl_ctx); if (ctx->input != NULL) { i_stream_set_max_buffer_size(ctx->input, ctx->input_orig_bufsize); i_stream_unref(&ctx->input); diff --git a/src/lib-http/http-client.c b/src/lib-http/http-client.c index ee1628b171..0a78e4e6b7 100644 --- a/src/lib-http/http-client.c +++ b/src/lib-http/http-client.c @@ -201,7 +201,7 @@ void http_client_deinit(struct http_client **_client) connection_list_deinit(&client->conn_list); if (client->ssl_ctx != NULL) - ssl_iostream_context_deinit(&client->ssl_ctx); + ssl_iostream_context_unref(&client->ssl_ctx); pool_unref(&client->pool); } diff --git a/src/lib-http/http-server.c b/src/lib-http/http-server.c index 62d74d5751..6172781027 100644 --- a/src/lib-http/http-server.c +++ b/src/lib-http/http-server.c @@ -52,7 +52,7 @@ void http_server_deinit(struct http_server **_server) connection_list_deinit(&server->conn_list); if (server->ssl_ctx != NULL) - ssl_iostream_context_deinit(&server->ssl_ctx); + ssl_iostream_context_unref(&server->ssl_ctx); pool_unref(&server->pool); } diff --git a/src/lib-imap-client/imapc-client.c b/src/lib-imap-client/imapc-client.c index 96f51b0305..0b586facbd 100644 --- a/src/lib-imap-client/imapc-client.c +++ b/src/lib-imap-client/imapc-client.c @@ -137,7 +137,7 @@ void imapc_client_unref(struct imapc_client **_client) return; if (client->ssl_ctx != NULL) - ssl_iostream_context_deinit(&client->ssl_ctx); + ssl_iostream_context_unref(&client->ssl_ctx); pool_unref(&client->pool); } diff --git a/src/lib-master/master-service-ssl.c b/src/lib-master/master-service-ssl.c index 984ac6205a..3bfd76d3e9 100644 --- a/src/lib-master/master-service-ssl.c +++ b/src/lib-master/master-service-ssl.c @@ -95,6 +95,6 @@ void master_service_ssl_ctx_init(struct master_service *service) void master_service_ssl_ctx_deinit(struct master_service *service) { if (service->ssl_ctx != NULL) - ssl_iostream_context_deinit(&service->ssl_ctx); + ssl_iostream_context_unref(&service->ssl_ctx); service->ssl_ctx_initialized = FALSE; } diff --git a/src/lib-ssl-iostream/iostream-openssl-context.c b/src/lib-ssl-iostream/iostream-openssl-context.c index 4fe8b420f9..1a2df3a3b6 100644 --- a/src/lib-ssl-iostream/iostream-openssl-context.c +++ b/src/lib-ssl-iostream/iostream-openssl-context.c @@ -589,7 +589,7 @@ int openssl_iostream_context_init_client(const struct ssl_iostream_settings *set ctx->ssl_ctx = ssl_ctx; ctx->client_ctx = TRUE; if (ssl_iostream_context_init_common(ctx, &set_copy, error_r) < 0) { - ssl_iostream_context_deinit(&ctx); + ssl_iostream_context_unref(&ctx); return -1; } *ctx_r = ctx; @@ -614,7 +614,7 @@ int openssl_iostream_context_init_server(const struct ssl_iostream_settings *set ctx = i_new(struct ssl_iostream_context, 1); ctx->ssl_ctx = ssl_ctx; if (ssl_iostream_context_init_common(ctx, set, error_r) < 0) { - ssl_iostream_context_deinit(&ctx); + ssl_iostream_context_unref(&ctx); return -1; } *ctx_r = ctx; diff --git a/src/lib-ssl-iostream/iostream-ssl.c b/src/lib-ssl-iostream/iostream-ssl.c index 863e196e69..e4485ec4e3 100644 --- a/src/lib-ssl-iostream/iostream-ssl.c +++ b/src/lib-ssl-iostream/iostream-ssl.c @@ -98,7 +98,7 @@ int ssl_iostream_context_init_server(const struct ssl_iostream_settings *set, return ssl_vfuncs->context_init_server(set, ctx_r, error_r); } -void ssl_iostream_context_deinit(struct ssl_iostream_context **_ctx) +void ssl_iostream_context_unref(struct ssl_iostream_context **_ctx) { struct ssl_iostream_context *ctx = *_ctx; diff --git a/src/lib-ssl-iostream/iostream-ssl.h b/src/lib-ssl-iostream/iostream-ssl.h index 77a00fe938..531bf05262 100644 --- a/src/lib-ssl-iostream/iostream-ssl.h +++ b/src/lib-ssl-iostream/iostream-ssl.h @@ -92,7 +92,9 @@ int ssl_iostream_context_init_client(const struct ssl_iostream_settings *set, int ssl_iostream_context_init_server(const struct ssl_iostream_settings *set, struct ssl_iostream_context **ctx_r, const char **error_r); -void ssl_iostream_context_deinit(struct ssl_iostream_context **ctx); +void ssl_iostream_context_unref(struct ssl_iostream_context **ctx); +/* FIXME: temporarily for backwards compatibility, remove later */ +#define ssl_iostream_context_deinit(ctx) ssl_iostream_context_unref(ctx) struct ssl_iostream_settings *ssl_iostream_settings_dup(pool_t pool, const struct ssl_iostream_settings *old_set); diff --git a/src/lib-storage/index/pop3c/pop3c-client.c b/src/lib-storage/index/pop3c/pop3c-client.c index 0197626478..51ac34e912 100644 --- a/src/lib-storage/index/pop3c/pop3c-client.c +++ b/src/lib-storage/index/pop3c/pop3c-client.c @@ -218,7 +218,7 @@ void pop3c_client_deinit(struct pop3c_client **_client) pop3c_client_disconnect(client); if (client->ssl_ctx != NULL) - ssl_iostream_context_deinit(&client->ssl_ctx); + ssl_iostream_context_unref(&client->ssl_ctx); pool_unref(&client->pool); }