From 3d318071982cc80867098ca5fe2641f31a289ac8 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 2 Jul 2017 13:00:22 +0200 Subject: 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. --- options/parse_commandline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'options/parse_commandline.c') diff --git a/options/parse_commandline.c b/options/parse_commandline.c index 2eb65e5c8e..b1392ba4e1 100644 --- a/options/parse_commandline.c +++ b/options/parse_commandline.c @@ -146,7 +146,7 @@ int m_config_parse_mp_command_line(m_config_t *config, struct playlist *files, int flags = M_SETOPT_FROM_CMDLINE; if (mode == LOCAL) flags |= M_SETOPT_BACKUP | M_SETOPT_CHECK_ONLY; - int r = m_config_set_option_ext(config, p.arg, p.param, flags); + int r = m_config_set_option_cli(config, p.arg, p.param, flags); if (r == M_OPT_EXIT) { ret = r; goto err_out; @@ -291,7 +291,7 @@ void m_config_preparse_command_line(m_config_t *config, struct mpv_global *globa // Ignore non-pre-parse options. They will be set later. // Option parsing errors will be handled later as well. int flags = M_SETOPT_FROM_CMDLINE | M_SETOPT_PRE_PARSE_ONLY; - m_config_set_option_ext(config, p.arg, p.param, flags); + m_config_set_option_cli(config, p.arg, p.param, flags); if (bstrcmp0(p.arg, "v") == 0) opts->verbose++; } -- cgit v1.2.3