From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 22 Jan 2025 20:39:10 +0000 (+0200)
Subject: global: Use settings_get_filter() where possible
X-Git-Tag: 2.4.1~260
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4073b16427ea22281b7328c86f9ff3bbedef2db;p=thirdparty%2Fdovecot%2Fcore.git

global: Use settings_get_filter() where possible
---

diff --git a/src/lib-program-client/program-client.c b/src/lib-program-client/program-client.c
index 5c2bfd4308..de16735a40 100644
--- a/src/lib-program-client/program-client.c
+++ b/src/lib-program-client/program-client.c
@@ -793,9 +793,9 @@ program_client_create_filter_auto(struct event *event, const char *execute_name,
 
 	/* Get settings for the first execute list filter */
 	event = event_create(event);
-	event_add_str(event, "execute", execute_name);
-	if (settings_get(event, &program_client_setting_parser_info, 0,
-			 &set, error_r) < 0) {
+	if (settings_get_filter(event, "execute", execute_name,
+				&program_client_setting_parser_info, 0,
+				&set, error_r) < 0) {
 		event_unref(&event);
 		return -1;
 	}
diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c
index f91b9ca998..a61fd0c7cc 100644
--- a/src/plugins/quota/quota-count.c
+++ b/src/plugins/quota/quota-count.c
@@ -39,10 +39,9 @@ quota_count_mailbox(struct quota_root *root, struct mail_namespace *ns,
 	int ret;
 
 	box = mailbox_alloc(ns->list, vname, MAILBOX_FLAG_READONLY);
-	struct event *event = event_create(box->event);
-	event_add_str(event, "quota", root->set->quota_name);
-	if (settings_get(event, &quota_root_setting_parser_info, 0,
-			 &set, error_r) < 0) {
+	if (settings_get_filter(box->event, "quota", root->set->quota_name,
+				&quota_root_setting_parser_info, 0,
+				&set, error_r) < 0) {
 		*error_result_r = QUOTA_GET_RESULT_INTERNAL_ERROR;
 		ret = -1;
 	} else if (set->quota_ignore)
@@ -77,7 +76,6 @@ quota_count_mailbox(struct quota_root *root, struct mail_namespace *ns,
 		*count += status.messages;
 	}
 	settings_free(set);
-	event_unref(&event);
 	mailbox_free(&box);
 	return ret;
 }
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index ab1177f48c..0e026c9d97 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -146,21 +146,11 @@ quota_root_settings_get(struct quota_root *root, struct event *set_event,
 			const struct quota_root_settings **set_r,
 			const char **error_r)
 {
-	struct event *event;
-
 	if (set_event == NULL)
-		event = root->backend.event;
-	else {
-		event = event_create(set_event);
-		event_add_str(event, "quota", root->set->quota_name);
-		settings_event_add_list_filter_name(event, "quota",
-						    root->set->quota_name);
-	}
-	int ret = settings_get(event, &quota_root_setting_parser_info, 0,
-			       set_r, error_r);
-	if (set_event != NULL)
-		event_unref(&event);
-	return ret;
+		set_event = root->backend.event;
+	return settings_get_filter(set_event, "quota", root->set->quota_name,
+				   &quota_root_setting_parser_info, 0,
+				   set_r, error_r);
 }
 
 static int quota_root_has_under_warnings(struct quota_root *root)