From e22ae2cba0cbca7c773e9ac29e57c48b689fae41 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 31 Aug 2016 22:22:02 +0200 Subject: m_config: remove an unused function Well, almost unused. --- options/m_config.c | 22 ++++++---------------- options/m_config.h | 8 -------- 2 files changed, 6 insertions(+), 24 deletions(-) (limited to 'options') diff --git a/options/m_config.c b/options/m_config.c index 1c2541a2c6..e5600228da 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -725,24 +725,14 @@ int m_config_set_option_node(struct m_config *config, bstr name, return r; } -const struct m_option *m_config_get_option(const struct m_config *config, - struct bstr name) -{ - assert(config != NULL); - - struct m_config_option *co = m_config_get_co(config, name); - return co ? co->opt : NULL; -} - int m_config_option_requires_param(struct m_config *config, bstr name) { - const struct m_option *opt = m_config_get_option(config, name); - if (opt) { - if (bstr_endswith0(name, "-clr")) - return 0; - return m_option_required_params(opt); - } - return M_OPT_UNKNOWN; + struct m_config_option *co = m_config_get_co(config, name); + if (!co) + return M_OPT_UNKNOWN; + if (bstr_endswith0(name, "-clr")) + return 0; + return m_option_required_params(co->opt); } static int sort_opt_compare(const void *pa, const void *pb) diff --git a/options/m_config.h b/options/m_config.h index 0d8b7961d0..e6d093582f 100644 --- a/options/m_config.h +++ b/options/m_config.h @@ -173,14 +173,6 @@ int m_config_set_option_node(struct m_config *config, bstr name, int m_config_parse_suboptions(struct m_config *config, char *name, char *subopts); - -/* Get the option matching the given name. - * \param config The config object. - * \param name The option's name. - */ -const struct m_option *m_config_get_option(const struct m_config *config, - struct bstr name); - struct m_config_option *m_config_get_co(const struct m_config *config, struct bstr name); -- cgit v1.2.3