From f0b5403b9d89c2231d7ac84f53f3723075ef0fb3 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 16 Nov 2021 18:46:41 +0100 Subject: locks: deprecate gnutls_global_set_mutex As the library now uses static mutexes, rwlocks, and onces, it doesn't make much sense to only replace dynamic mutex usage. Signed-off-by: Daiki Ueno --- lib/locks.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/lib/locks.c b/lib/locks.c index 146a806132..d61504e077 100644 --- a/lib/locks.c +++ b/lib/locks.c @@ -43,34 +43,25 @@ * unless really needed to. GnuTLS will use the appropriate locks for the running * system. * - * Note that since the move to implicit initialization of GnuTLS on library - * load, calling this function will deinitialize the library, and re-initialize - * it after the new locking functions are set. + * This function must be called prior to any other GnuTLS function; otherwise + * the behavior is undefined. + * + * Deprecated: This function is discouraged on GnuTLS 3.7.3 or later. * - * This function must be called prior to any other gnutls function. - * * Since: 2.12.0 **/ void gnutls_global_set_mutex(mutex_init_func init, mutex_deinit_func deinit, mutex_lock_func lock, mutex_unlock_func unlock) { -int ret; - - if (init == NULL || deinit == NULL || lock == NULL - || unlock == NULL) + if (init == NULL || deinit == NULL || lock == NULL || unlock == NULL) { return; - - gnutls_global_deinit(); + } gnutls_mutex_init = init; gnutls_mutex_deinit = deinit; gnutls_mutex_lock = lock; gnutls_mutex_unlock = unlock; - - ret = gnutls_global_init(); - if (ret < 0) - _gnutls_debug_log("error in gnutls_global_init(): %s\n", gnutls_strerror(ret)); } int -- cgit v1.2.1