lib-settings: Remove unused settings_try_get()

This isn't likely to be used after all. Most named filters have default
settings, so there is no distinction between existing and nonexistent
filter.

diff --git a/src/lib-settings/settings.c b/src/lib-settings/settings.c
index 23e1dcc9e679241eb852f778c0d121228a8990c9..d23eff07c9018ad6f73f5de7ac14ad6217fac422 100644 (file)
--- a/src/lib-settings/settings.c
+++ b/src/lib-settings/settings.c
@@ -1725,19 +1725,6 @@ int settings_get(struct event *event,
        return ret < 0 ? -1 : 0;
 }
 
-#undef settings_try_get
-int settings_try_get(struct event *event, const char *filter_name,
-                    const struct setting_parser_info *info,
-                    enum settings_get_flags flags,
-                    const char *source_filename,
-                    unsigned int source_linenum,
-                    const void **set_r, const char **error_r)
-{
-       return settings_get_full(event, filter_name, NULL, info, flags,
-                                source_filename, source_linenum,
-                                set_r, error_r);
-}
-
 #undef settings_get_filter
 int settings_get_filter(struct event *event,
                        const char *filter_key, const char *filter_value,

diff --git a/src/lib-settings/settings.h b/src/lib-settings/settings.h
index 87394bd24f0307ad676de8d34d5d28c6d4082632..ea21fc3e3438825a6849d58105171dd7b45f8c30 100644 (file)
--- a/src/lib-settings/settings.h
+++ b/src/lib-settings/settings.h
@@ -151,27 +151,6 @@ int settings_get(struct event *event,
                __FILE__, __LINE__, (void *)set_r, error_r)
 #endif
 
-/* Same as settings_get(), but looks up settings for a specific named
-   (non-list) filter. Use e.g. { filter_name="oauth2" }. Returns 1 if settings
-   for the filter are found, 0 if not (set_r is not set), -1 if error. */
-int settings_try_get(struct event *event, const char *filter_name,
-                    const struct setting_parser_info *info,
-                    enum settings_get_flags flags,
-                    const char *source_filename,
-                    unsigned int source_linenum,
-                    const void **set_r, const char **error_r);
-#ifdef HAVE_TYPE_CHECKS
-#  define settings_try_get(event, filter_name, info, flags, set_r, error_r) \
-       settings_try_get(event, filter_name, info, flags, \
-               __FILE__, __LINE__, (void *)set_r, 1 ? (error_r) : \
-       COMPILE_ERROR_IF_TRUE( \
-               !__builtin_types_compatible_p(typeof((*set_r)->pool), pool_t)))
-#else
-#  define settings_try_get(event, filter_name, info, flags, set_r, error_r) \
-       settings_try_get(event, filter_name, info, flags, \
-               __FILE__, __LINE__, (void *)set_r, error_r)
-#endif
-
 /* Same as settings_get(), but looks up settings for a specific named list
    filter. Use e.g. { filter_key="namespace", filter_value="inbox" }.
    Returns 0 on success, -1 on error.