From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 10 Apr 2025 09:21:29 +0000 (+0300)
Subject: lib-settings: Remove unnecessary settings_override.path_element_count
X-Git-Tag: 2.4.2~804
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6666bbdc87df7516d420829cbe870e2293ae7b0;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: Remove unnecessary settings_override.path_element_count

It has not been used since 09e551901eeb21bd8fc7b07eb67d80fd43fbb71e
---

diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index 5ddb80f6f9..ef7d6c6357 100644
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -46,8 +46,6 @@ struct settings_override {
 	ARRAY_TYPE(settings_override) *overrides_array;
 	enum settings_override_type type;
 
-	/* Number of '/' characters in orig_key + 1 */
-	unsigned int path_element_count;
 	/* Number of named list filter elements in this override */
 	unsigned int filter_array_element_count;
 	/* Number of named (non-list) filter elements in this override */
@@ -190,16 +188,6 @@ settings_instance_override(struct settings_apply_ctx *ctx,
 			   struct event_filter *event_filter,
 			   bool *defaults, const char **error_r);
 
-static unsigned int path_element_count(const char *key)
-{
-	unsigned int count = 1;
-	while ((key = strchr(key, '/')) != NULL) {
-		key++;
-		count++;
-	}
-	return count;
-}
-
 static bool settings_local_name_cmp(const char *value, const char *wanted_value)
 {
 	return dns_match_wildcard(value, wanted_value) == 0;
@@ -2021,7 +2009,6 @@ settings_instance_override_add_default(struct settings_apply_ctx *ctx,
 		/* We're building the full event filter, so jump forward in
 		   the key path until the last field. */
 		set->key = array_def->filter_array_field_name;
-		set->path_element_count = path_element_count(set->orig_key);
 		set->filter_array_element_count =
 			array_set->filter_array_element_count;
 		set->filter_element_count =
@@ -2093,7 +2080,6 @@ settings_instance_overrides_add_filters(struct settings_apply_ctx *ctx,
 		set->pool = ctx->temp_pool;
 		set->type = SETTINGS_OVERRIDE_TYPE_DEFAULT;
 		set->key = set->orig_key = defaults[i].key;
-		set->path_element_count = path_element_count(set->key);
 		set->value = defaults[i].value;
 		if ((ret = settings_apply_add_override(ctx, set, &error)) < 0)
 			i_panic("Applying default settings failed: %s", error);
@@ -2930,7 +2916,6 @@ settings_override_fill(struct settings_override *set, pool_t pool,
 			key = t_strndup(key, len);
 		}
 		set->key = set->orig_key = p_strdup(pool, key);
-		set->path_element_count = path_element_count(set->key);
 		set->value = p_strdup(pool, value);
 	} T_END;
 }