From b3599dbb6af7e28efae5f08ace99cc75f5e90b2f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 12 Apr 2016 12:20:16 +0100 Subject: Rename int_*() functions to *_int() There is a preference for suffixes to indicate that a function is internal rather than prefixes. Note: the suffix is only required to disambiguate internal functions and public symbols with the same name (but different case) Reviewed-by: Tim Hudson Reviewed-by: Richard Levitte --- ssl/ssl_ciph.c | 2 +- ssl/ssl_init.c | 10 +++++----- ssl/ssl_locl.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'ssl') diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 100e95e30e..d0d9d88e1e 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c @@ -1908,7 +1908,7 @@ static void cmeth_free(SSL_COMP *cm) OPENSSL_free(cm); } -void int_ssl_comp_free_compression_methods(void) +void ssl_comp_free_compression_methods_int(void) { STACK_OF(SSL_COMP) *old_meths = ssl_comp_methods; ssl_comp_methods = NULL; diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c index c52d48b543..54892b9ac8 100644 --- a/ssl/ssl_init.c +++ b/ssl/ssl_init.c @@ -198,24 +198,24 @@ static void ssl_library_stop(void) #ifndef OPENSSL_NO_COMP #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " - "int_ssl_comp_free_compression_methods()\n"); + "ssl_comp_free_compression_methods_int()\n"); #endif - int_ssl_comp_free_compression_methods(); + ssl_comp_free_compression_methods_int(); #endif } if (ssl_strings_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " - "int_err_free_strings()\n"); + "err_free_strings_int()\n"); #endif /* * If both crypto and ssl error strings are inited we will end up - * calling int_err_free_strings() twice - but that's ok. The second + * calling err_free_strings_int() twice - but that's ok. The second * time will be a no-op. It's easier to do that than to try and track * between the two libraries whether they have both been inited. */ - int_err_free_strings(); + err_free_strings_int(); } } diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index adc5924785..50e0d3900a 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -2195,7 +2195,7 @@ __owur int custom_ext_add(SSL *s, int server, __owur int custom_exts_copy(custom_ext_methods *dst, const custom_ext_methods *src); void custom_exts_free(custom_ext_methods *exts); -void int_ssl_comp_free_compression_methods(void); +void ssl_comp_free_compression_methods_int(void); # else -- cgit v1.2.3