From 342c21cd8bb42b6750abfc49cac26dc288de98c3 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 6 Apr 2016 10:39:00 +0100 Subject: Rename lots of *_intern or *_internal function to int_* There was a lot of naming inconsistency, so we try and standardise on one form. 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 1faa2ea160..100e95e30e 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 ssl_comp_free_compression_methods_intern(void) +void int_ssl_comp_free_compression_methods(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 2f8034a7d3..c52d48b543 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: " - "ssl_comp_free_compression_methods_intern()\n"); + "int_ssl_comp_free_compression_methods()\n"); #endif - ssl_comp_free_compression_methods_intern(); + int_ssl_comp_free_compression_methods(); #endif } if (ssl_strings_inited) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ssl_library_stop: " - "err_free_strings_intern()\n"); + "int_err_free_strings()\n"); #endif /* * If both crypto and ssl error strings are inited we will end up - * calling err_free_strings_intern() twice - but that's ok. The second + * calling int_err_free_strings() 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. */ - err_free_strings_intern(); + int_err_free_strings(); } } diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 1596091e81..adc5924785 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 ssl_comp_free_compression_methods_intern(void); +void int_ssl_comp_free_compression_methods(void); # else -- cgit v1.2.3