summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-08-31 22:22:02 +0200
committerwm4 <wm4@nowhere>2016-08-31 22:22:21 +0200
commite22ae2cba0cbca7c773e9ac29e57c48b689fae41 (patch)
tree3e46c846a17a7399b6aa2fd459ebcee53a500063 /options
parentaae47146a793b7a31c7ffa1c2ac2a716caadd067 (diff)
downloadmpv-e22ae2cba0cbca7c773e9ac29e57c48b689fae41.tar.bz2
mpv-e22ae2cba0cbca7c773e9ac29e57c48b689fae41.tar.xz
m_config: remove an unused function
Well, almost unused.
Diffstat (limited to 'options')
-rw-r--r--options/m_config.c22
-rw-r--r--options/m_config.h8
2 files changed, 6 insertions, 24 deletions
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);