From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sun, 28 May 2023 21:59:42 +0000 (+0300)
Subject: lib-settings: Remove unused settings_parser_apply_changes()
X-Git-Tag: 2.4.0~2102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddd25a243d25ca0ee7bbc841ad43ec56f4486196;p=thirdparty%2Fdovecot%2Fcore.git

lib-settings: Remove unused settings_parser_apply_changes()
---

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index 42e91e643f..5f50ef90a3 100644
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -1475,14 +1475,6 @@ settings_apply(struct setting_link *dest_link,
 	return 0;
 }
 
-int settings_parser_apply_changes(struct setting_parser_context *dest,
-				  const struct setting_parser_context *src,
-				  pool_t pool, const char **conflict_key_r)
-{
-	i_assert(src->root.info == dest->root.info);
-	return settings_apply(&dest->root, &src->root, pool, conflict_key_r);
-}
-
 const char *settings_section_escape(const char *name)
 {
 #define CHAR_NEED_ESCAPE(c) \
diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h
index 7cbf2c7e47..658908e75a 100644
--- a/src/lib-settings/settings-parser.h
+++ b/src/lib-settings/settings-parser.h
@@ -200,17 +200,6 @@ struct setting_parser_context *
 settings_parser_dup(const struct setting_parser_context *old_ctx,
 		    pool_t new_pool);
 
-/* Copy changed settings from src to dest. If conflict_key_r is not NULL and
-   both src and dest have changed the same setting, return -1 and set the
-   key name. If it's NULL, the old setting is kept.
-
-   KLUDGE: For SET_STRLIST types if both source and destination have identical
-   keys, the duplicates in the source side are ignored. This is required to
-   make the current config code work correctly. */
-int settings_parser_apply_changes(struct setting_parser_context *dest,
-				  const struct setting_parser_context *src,
-				  pool_t pool, const char **conflict_key_r);
-
 /* Return section name escaped */
 const char *settings_section_escape(const char *name);