From 039a6194a473564f37525e94b689494c00145c5d Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 5 Aug 2012 16:50:49 +0200 Subject: [PATCH] options: remove CONF_TYPE_PRINT_INDIRECT This was unused. --- m_option.c | 9 +-------- m_option.h | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/m_option.c b/m_option.c index 283e24b37b..ddd538d4aa 100644 --- a/m_option.c +++ b/m_option.c @@ -790,9 +790,7 @@ const m_option_type_t m_option_type_string_list = { static int parse_print(const m_option_t *opt, struct bstr name, struct bstr param, bool ambiguous_param, void *dst) { - if (opt->type == CONF_TYPE_PRINT_INDIRECT) - mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", *(char **) opt->p); - else if (opt->type == CONF_TYPE_PRINT_FUNC) { + if (opt->type == CONF_TYPE_PRINT_FUNC) { char *name0 = bstrdup0(NULL, name); char *param0 = bstrdup0(NULL, param); int r = ((m_opt_func_full_t) opt->p)(opt, name0, param0); @@ -812,11 +810,6 @@ const m_option_type_t m_option_type_print = { .parse = parse_print, }; -const m_option_type_t m_option_type_print_indirect = { - .name = "Print", - .parse = parse_print, -}; - const m_option_type_t m_option_type_print_func = { .name = "Print", .flags = M_OPT_TYPE_ALLOW_WILDCARD, diff --git a/m_option.h b/m_option.h index 064444a63f..6ff6ec2f14 100644 --- a/m_option.h +++ b/m_option.h @@ -49,7 +49,6 @@ extern const m_option_type_t m_option_type_time_size; extern const m_option_type_t m_option_type_choice; extern const m_option_type_t m_option_type_print; -extern const m_option_type_t m_option_type_print_indirect; extern const m_option_type_t m_option_type_print_func; extern const m_option_type_t m_option_type_subconfig; extern const m_option_type_t m_option_type_imgfmt; @@ -157,7 +156,6 @@ struct m_opt_choice_alternatives { #define CONF_TYPE_DOUBLE (&m_option_type_double) #define CONF_TYPE_STRING (&m_option_type_string) #define CONF_TYPE_PRINT (&m_option_type_print) -#define CONF_TYPE_PRINT_INDIRECT (&m_option_type_print_indirect) #define CONF_TYPE_PRINT_FUNC (&m_option_type_print_func) #define CONF_TYPE_SUBCONFIG (&m_option_type_subconfig) #define CONF_TYPE_STRING_LIST (&m_option_type_string_list)