rename metrics post_config/child_init/cleanup functions

Signed-off-by: Hans Zandbelt <[email protected]>

Author: zandbelt

src/cfg/cfg.c

@@ -901,7 +901,7 @@ int oidc_cfg_post_config(oidc_cfg_t *cfg, server_rec *s) {
 			return HTTP_INTERNAL_SERVER_ERROR;
 	}
 	if (cfg->metrics_hook_data != NULL) {
-		if (oidc_metrics_cache_post_config(s) != TRUE)
+		if (oidc_metrics_post_config(s) != TRUE)
 			return HTTP_INTERNAL_SERVER_ERROR;
 	}
 	return OK;
@@ -919,7 +919,7 @@ void oidc_cfg_child_init(apr_pool_t *pool, oidc_cfg_t *cfg, server_rec *s) {
 		}
 	}
 	if (cfg->metrics_hook_data != NULL) {
-		if (oidc_metrics_cache_child_init(pool, s) != APR_SUCCESS) {
+		if (oidc_metrics_child_init(pool, s) != APR_SUCCESS) {
 			oidc_serror(s, "oidc_metrics_cache_child_init failed");
 		}
 	}
@@ -939,7 +939,7 @@ void oidc_cfg_cleanup_child(oidc_cfg_t *cfg, server_rec *s) {
 		_oidc_refresh_mutex = NULL;
 	}
 	if (cfg->metrics_hook_data != NULL) {
-		if (oidc_metrics_cache_cleanup(s) != APR_SUCCESS) {
+		if (oidc_metrics_cleanup(s) != APR_SUCCESS) {
 			oidc_serror(s, "oidc_metrics_cache_cleanup failed");
 		}
 	}

src/metrics.c

@@ -705,7 +705,7 @@ static void *APR_THREAD_FUNC oidc_metrics_thread_run(apr_thread_t *thread, void
 /*
  * NB: global, yet called for each vhost that has metrics enabled!
  */
-apr_byte_t oidc_metrics_cache_post_config(server_rec *s) {
+apr_byte_t oidc_metrics_post_config(server_rec *s) {
 
 	/* make sure it gets executed exactly once! */
 	if (_oidc_metrics_cache != NULL)
@@ -752,7 +752,7 @@ apr_byte_t oidc_metrics_cache_post_config(server_rec *s) {
 /*
  * NB: global, yet called for each vhost that has metrics enabled!
  */
-apr_status_t oidc_metrics_cache_child_init(apr_pool_t *p, server_rec *s) {
+apr_status_t oidc_metrics_child_init(apr_pool_t *p, server_rec *s) {
 
 	/* make sure this executes only once per child */
 	if (_oidc_metrics_is_parent == FALSE)
@@ -777,7 +777,7 @@ apr_status_t oidc_metrics_cache_child_init(apr_pool_t *p, server_rec *s) {
 /*
  * NB: global, yet called for each vhost that has metrics enabled!
  */
-apr_status_t oidc_metrics_cache_cleanup(server_rec *s) {
+apr_status_t oidc_metrics_cleanup(server_rec *s) {
 
 	/* make sure it gets executed exactly once! */
 	if (_oidc_metrics_cache == NULL)

src/metrics.h

@@ -48,9 +48,9 @@
 #include <httpd.h>
 
 apr_byte_t oidc_metrics_is_valid_classname(apr_pool_t *pool, const char *name, char **valid_names);
-apr_byte_t oidc_metrics_cache_post_config(server_rec *s);
-apr_status_t oidc_metrics_cache_child_init(apr_pool_t *p, server_rec *s);
-apr_status_t oidc_metrics_cache_cleanup(server_rec *s);
+apr_byte_t oidc_metrics_post_config(server_rec *s);
+apr_status_t oidc_metrics_child_init(apr_pool_t *p, server_rec *s);
+apr_status_t oidc_metrics_cleanup(server_rec *s);
 int oidc_metrics_handle_request(request_rec *r);
 
 // NB: order must match what is defined in metrics.c in array _oidc_metrics_timings_info