lib-settings: Remove setting_parser_info.default_settings

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index 26a2d4f3eddce6d69a1d887f8286e86808bc3c4c..d116e0b3b254a76c700ee28ea13143ddc343dcf2 100644 (file)
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -250,7 +250,6 @@ static void config_parser_add_info_defaults(struct config_parser_context *ctx,
                                            const struct setting_parser_info *info)
 {
        config_parser_set_change_counter(ctx, CONFIG_PARSER_CHANGE_INTERNAL);
-       config_parser_add_info_defaults_arr(ctx, info, info->default_settings);
        config_parser_add_info_defaults_arr(ctx, info, info->default_filter_settings);
        config_parser_set_change_counter(ctx, CONFIG_PARSER_CHANGE_EXPLICIT);
 }

diff --git a/src/config/settings-get.pl b/src/config/settings-get.pl
index b37a3ab6466d966514815e618ec9fe84c0ade587..713ee3921e0c5f60cd53c9c3d53c76c86ddfb909 100755 (executable)
--- a/src/config/settings-get.pl
+++ b/src/config/settings-get.pl
@@ -53,7 +53,6 @@ foreach my $file (@ARGV) {
       if (/struct .*_settings \{/ ||
           /struct setting_define.*\{/ ||
           /struct .*_default_settings = \{/ ||
-          /struct setting_keyvalue.*_default_settings_keyvalue\[\] = \{/ ||
           /struct setting_keyvalue.*_default_filter_settings_keyvalue\[\] = \{/) {
         # settings-related structure - copy.
         $state = "copy-to-end-of-block";

diff --git a/src/lib-settings/settings-parser.c b/src/lib-settings/settings-parser.c
index e93f44f879443e4b42795bfda820c96ae1770f02..928483099f045307c813276c0383ae0f57f4186e 100644 (file)
--- a/src/lib-settings/settings-parser.c
+++ b/src/lib-settings/settings-parser.c
@@ -59,23 +59,6 @@ setting_parser_copy_defaults(struct setting_parser_context *ctx,
        }
 }
 
-static void
-setting_parser_fill_defaults_strings(struct setting_parser_context *ctx)
-{
-       const struct setting_keyvalue *defaults = ctx->info->default_settings;
-       if (defaults == NULL)
-               return;
-
-       for (unsigned int i = 0; defaults[i].key != NULL; i++) {
-               const char *key = defaults[i].key;
-               const char *value = defaults[i].value;
-               if (settings_parse_keyvalue_nodup(ctx, key, value) <= 0) {
-                       i_panic("Failed to add default setting %s=%s: %s",
-                               key, value, settings_parser_get_error(ctx));
-               }
-       }
-}
-
 struct setting_parser_context *
 settings_parser_init(pool_t set_pool, const struct setting_parser_info *root,
                     enum settings_parser_flags flags)
@@ -96,7 +79,6 @@ settings_parser_init(pool_t set_pool, const struct setting_parser_info *root,
                ctx->set_struct =
                        p_malloc(ctx->set_pool, root->struct_size);
                setting_parser_copy_defaults(ctx, root);
-               setting_parser_fill_defaults_strings(ctx);
        }
 
        pool_ref(ctx->set_pool);

diff --git a/src/lib-settings/settings-parser.h b/src/lib-settings/settings-parser.h
index 95a11904b45f692c338533a9a06dcb15555b7511..7e4d8dad13463e9c4c1c1cd1d6edd7bffc453994 100644 (file)
--- a/src/lib-settings/settings-parser.h
+++ b/src/lib-settings/settings-parser.h
@@ -123,8 +123,6 @@ struct setting_parser_info {
 
        const struct setting_define *defines;
        const void *defaults;
-       /* Add defaults via strings on top of the of defaults struct. */
-       const struct setting_keyvalue *default_settings;
        /* Add defaults to named filters. These are applied while parsing
           the configuration. */
        const struct setting_keyvalue *default_filter_settings;