From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 10 Feb 2021 19:43:18 +0000 (+0200)
Subject: stats: Use array_foreach_elem() where possible
X-Git-Tag: 2.3.16~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6392b0706f89dad4b225ab871ba257e678188ef8;p=thirdparty%2Fdovecot%2Fcore.git

stats: Use array_foreach_elem() where possible
---

diff --git a/src/stats/client-http.c b/src/stats/client-http.c
index b39c8caae5..1811917934 100644
--- a/src/stats/client-http.c
+++ b/src/stats/client-http.c
@@ -133,7 +133,7 @@ static void
 stats_http_resource_root_make_response(struct http_server_response *resp,
 				       const struct http_request *hreq)
 {
-	struct stats_http_resource *const *res_p;
+	struct stats_http_resource *res;
 	struct http_url url;
 	string_t *msg;
 
@@ -154,9 +154,7 @@ stats_http_resource_root_make_response(struct http_server_response *resp,
 	str_append(msg, "<h1>Dovecot Stats:</h1>\n");
 	str_append(msg, "<p><ul>\n");
 
-	array_foreach(&stats_http_resources, res_p) {
-		struct stats_http_resource *res = *res_p;
-
+	array_foreach_elem(&stats_http_resources, res) {
 		if (res->title == NULL)
 			continue;
 
diff --git a/src/stats/stats-metrics.c b/src/stats/stats-metrics.c
index f4d7aa28ec..5ff68b5db0 100644
--- a/src/stats/stats-metrics.c
+++ b/src/stats/stats-metrics.c
@@ -102,7 +102,7 @@ stats_metric_alloc(pool_t pool, const char *name,
 static void stats_metrics_add_set(struct stats_metrics *metrics,
 				  const struct stats_metric_settings *set)
 {
-	struct exporter *const *exporter;
+	struct exporter *exporter;
 	struct metric *metric;
 	const char *const *fields;
 	const char *const *tmp;
@@ -125,9 +125,9 @@ static void stats_metrics_add_set(struct stats_metrics *metrics,
 	if (set->exporter[0] == '\0')
 		return; /* not exported */
 
-	array_foreach(&metrics->exporters, exporter) {
-		if (strcmp(set->exporter, (*exporter)->name) == 0) {
-			metric->export_info.exporter = *exporter;
+	array_foreach_elem(&metrics->exporters, exporter) {
+		if (strcmp(set->exporter, exporter->name) == 0) {
+			metric->export_info.exporter = exporter;
 			break;
 		}
 	}
@@ -164,24 +164,24 @@ stats_metrics_add_from_settings(struct stats_metrics *metrics,
 	if (!array_is_created(&set->exporters)) {
 		p_array_init(&metrics->exporters, metrics->pool, 0);
 	} else {
-		struct stats_exporter_settings *const *exporter_setp;
+		struct stats_exporter_settings *exporter_set;
 
 		p_array_init(&metrics->exporters, metrics->pool,
 			     array_count(&set->exporters));
-		array_foreach(&set->exporters, exporter_setp)
-			stats_exporters_add_set(metrics, *exporter_setp);
+		array_foreach_elem(&set->exporters, exporter_set)
+			stats_exporters_add_set(metrics, exporter_set);
 	}
 
 	/* then add all the metrics */
 	if (!array_is_created(&set->metrics)) {
 		p_array_init(&metrics->metrics, metrics->pool, 0);
 	} else {
-		struct stats_metric_settings *const *metric_setp;
+		struct stats_metric_settings *metric_set;
 
 		p_array_init(&metrics->metrics, metrics->pool,
 			     array_count(&set->metrics));
-		array_foreach(&set->metrics, metric_setp) T_BEGIN {
-			stats_metrics_add_set(metrics, *metric_setp);
+		array_foreach_elem(&set->metrics, metric_set) T_BEGIN {
+			stats_metrics_add_set(metrics, metric_set);
 		} T_END;
 	}
 }
@@ -200,14 +200,14 @@ struct stats_metrics *stats_metrics_init(const struct stats_settings *set)
 
 static void stats_metric_free(struct metric *metric)
 {
-	struct metric *const *metricp;
+	struct metric *sub_metric;
 	stats_dist_deinit(&metric->duration_stats);
 	for (unsigned int i = 0; i < metric->fields_count; i++)
 		stats_dist_deinit(&metric->fields[i].stats);
 	if (!array_is_created(&metric->sub_metrics))
 		return;
-	array_foreach(&metric->sub_metrics, metricp)
-		stats_metric_free(*metricp);
+	array_foreach_elem(&metric->sub_metrics, sub_metric)
+		stats_metric_free(sub_metric);
 }
 
 static void stats_export_deinit(void)
@@ -220,36 +220,36 @@ static void stats_export_deinit(void)
 void stats_metrics_deinit(struct stats_metrics **_metrics)
 {
 	struct stats_metrics *metrics = *_metrics;
-	struct metric *const *metricp;
+	struct metric *metric;
 
 	*_metrics = NULL;
 
 	stats_export_deinit();
 
-	array_foreach(&metrics->metrics, metricp)
-		stats_metric_free(*metricp);
+	array_foreach_elem(&metrics->metrics, metric)
+		stats_metric_free(metric);
 	event_filter_unref(&metrics->filter);
 	pool_unref(&metrics->pool);
 }
 
 static void stats_metric_reset(struct metric *metric)
 {
-	struct metric *const *metricp;
+	struct metric *sub_metric;
 	stats_dist_reset(metric->duration_stats);
 	for (unsigned int i = 0; i < metric->fields_count; i++)
 		stats_dist_reset(metric->fields[i].stats);
 	if (!array_is_created(&metric->sub_metrics))
 		return;
-	array_foreach(&metric->sub_metrics, metricp)
-		stats_metric_reset(*metricp);
+	array_foreach_elem(&metric->sub_metrics, sub_metric)
+		stats_metric_reset(sub_metric);
 }
 
 void stats_metrics_reset(struct stats_metrics *metrics)
 {
-	struct metric *const *metricp;
+	struct metric *metric;
 
-	array_foreach(&metrics->metrics, metricp)
-		stats_metric_reset(*metricp);
+	array_foreach_elem(&metrics->metrics, metric)
+		stats_metric_reset(metric);
 }
 
 struct event_filter *
@@ -262,23 +262,23 @@ static struct metric *
 stats_metric_get_sub_metric(struct metric *metric,
 			    const struct metric_value *value)
 {
-	struct metric *const *sub_metrics;
+	struct metric *sub_metrics;
 
 	/* lookup sub-metric */
-	array_foreach (&metric->sub_metrics, sub_metrics) {
-		switch ((*sub_metrics)->group_value.type) {
+	array_foreach_elem(&metric->sub_metrics, sub_metrics) {
+		switch (sub_metrics->group_value.type) {
 		case METRIC_VALUE_TYPE_STR:
-			if (memcmp((*sub_metrics)->group_value.hash, value->hash,
+			if (memcmp(sub_metrics->group_value.hash, value->hash,
 				   SHA1_RESULTLEN) == 0)
-				return *sub_metrics;
+				return sub_metrics;
 			break;
 		case METRIC_VALUE_TYPE_INT:
-			if ((*sub_metrics)->group_value.intmax == value->intmax)
-				return *sub_metrics;
+			if (sub_metrics->group_value.intmax == value->intmax)
+				return sub_metrics;
 			break;
 		case METRIC_VALUE_TYPE_BUCKET_INDEX:
-			if ((*sub_metrics)->group_value.intmax == value->intmax)
-				return *sub_metrics;
+			if (sub_metrics->group_value.intmax == value->intmax)
+				return sub_metrics;
 			break;
 		}
 	}
diff --git a/src/stats/stats-service-openmetrics.c b/src/stats/stats-service-openmetrics.c
index b8c4c29494..17d3ac8925 100644
--- a/src/stats/stats-service-openmetrics.c
+++ b/src/stats/stats-service-openmetrics.c
@@ -163,14 +163,12 @@ static const struct metric *
 openmetrics_find_histogram_bucket(const struct metric *metric,
 				 unsigned int index)
 {
-	struct metric *const *sub_metric_p;
+	struct metric *sub_metric;
 
 	if (!array_is_created(&metric->sub_metrics))
 		return NULL;
 
-	array_foreach(&metric->sub_metrics, sub_metric_p) {
-		struct metric *sub_metric = *sub_metric_p;
-
+	array_foreach_elem(&metric->sub_metrics, sub_metric) {
 		if (sub_metric->group_value.type !=
 		    METRIC_VALUE_TYPE_BUCKET_INDEX)
 			continue;
diff --git a/src/stats/stats-settings.c b/src/stats/stats-settings.c
index c7e631eeb1..f5c4e19ded 100644
--- a/src/stats/stats-settings.c
+++ b/src/stats/stats-settings.c
@@ -502,21 +502,21 @@ static bool stats_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 				 const char **error_r)
 {
 	struct stats_settings *set = _set;
-	struct stats_exporter_settings *const *exporter;
-	struct stats_metric_settings *const *metric;
+	struct stats_exporter_settings *exporter;
+	struct stats_metric_settings *metric;
 
 	if (!array_is_created(&set->metrics) || !array_is_created(&set->exporters))
 		return TRUE;
 
 	/* check that all metrics refer to exporters that exist */
-	array_foreach(&set->metrics, metric) {
+	array_foreach_elem(&set->metrics, metric) {
 		bool found = FALSE;
 
-		if ((*metric)->exporter[0] == '\0')
+		if (metric->exporter[0] == '\0')
 			continue; /* metric not exported */
 
-		array_foreach(&set->exporters, exporter) {
-			if (strcmp((*metric)->exporter, (*exporter)->name) == 0) {
+		array_foreach_elem(&set->exporters, exporter) {
+			if (strcmp(metric->exporter, exporter->name) == 0) {
 				found = TRUE;
 				break;
 			}
@@ -525,8 +525,8 @@ static bool stats_settings_check(void *_set, pool_t pool ATTR_UNUSED,
 		if (!found) {
 			*error_r = t_strdup_printf("metric %s refers to "
 						   "non-existent exporter '%s'",
-						   (*metric)->metric_name,
-						   (*metric)->exporter);
+						   metric->metric_name,
+						   metric->exporter);
 			return FALSE;
 		}
 	}