diff options
| author | wm4 <wm4@nowhere> | 2017-07-02 13:00:22 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-07-02 13:07:36 +0200 |
| commit | 3d318071982cc80867098ca5fe2641f31a289ac8 (patch) | |
| tree | d388d93a5ee37e98b818733bf0e139740a048f1e /options/m_option.c | |
| parent | 66478cff14faaafb124c9e80f80b6fe0ad38a050 (diff) | |
| download | mpv-3d318071982cc80867098ca5fe2641f31a289ac8.tar.bz2 mpv-3d318071982cc80867098ca5fe2641f31a289ac8.tar.xz | |
m_option: remove redundant indirections
Remove the various redundant m_config_set_option* calls, rename the
remaining one to m_config_set_option_cli(), and merge the
m_config_parse_option() function.
Diffstat (limited to 'options/m_option.c')
| -rw-r--r-- | options/m_option.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/options/m_option.c b/options/m_option.c index ae63044e50..b8a9f7384c 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -2621,7 +2621,7 @@ static int get_obj_param(struct mp_log *log, bstr opt_name, bstr obj_name, // If it's just "name", and the associated option exists and is a flag, // don't accept it as positional argument. if (val.start || m_config_option_requires_param(config, name) == 0 || nopos) { - r = m_config_set_option_ext(config, name, val, flags); + r = m_config_set_option_cli(config, name, val, flags); if (r < 0) { if (r == M_OPT_UNKNOWN) { mp_err(log, "Option %.*s: %.*s doesn't have a %.*s parameter.\n", @@ -2652,7 +2652,7 @@ static int get_obj_param(struct mp_log *log, bstr opt_name, bstr obj_name, BSTR_P(opt_name), BSTR_P(obj_name), *nold, *nold); return M_OPT_OUT_OF_RANGE; } - r = m_config_set_option_ext(config, bstr0(opt), val, flags); + r = m_config_set_option_cli(config, bstr0(opt), val, flags); if (r < 0) { if (r != M_OPT_EXIT) mp_err(log, "Option %.*s: " |