diff options
Diffstat (limited to 'm_option.c')
| -rw-r--r-- | m_option.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/m_option.c b/m_option.c index 35e2b775c9..0b11e67e5d 100644 --- a/m_option.c +++ b/m_option.c @@ -798,8 +798,6 @@ static void set_func_param(const m_option_t* opt, void* dst, void* src) { if(!s) return; - // Revert if needed - if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,opt->name); for( ; s != NULL ; s = s->next) ((m_opt_func_param_t) opt->p)(opt,s->param); } @@ -847,18 +845,12 @@ const m_option_type_t m_option_type_func_full = { /////////////// Func #undef VAL -#define VAL(x) (*(int*)(x)) static int parse_func(const m_option_t* opt,const char *name, char *param, void* dst, int src) { - if(dst) - VAL(dst) += 1; return 0; } static void set_func(const m_option_t* opt,void* dst, void* src) { - int i; - if(opt->priv) ((m_opt_default_func_t)opt->priv)(opt,opt->name); - for(i = 0 ; i < VAL(src) ; i++) ((m_opt_func_t) opt->p)(opt); } @@ -883,7 +875,7 @@ static int parse_print(const m_option_t* opt,const char *name, char *param, void else if(opt->type == CONF_TYPE_PRINT_FUNC) return ((m_opt_func_full_t) opt->p)(opt,name,param); else - mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", (char *) opt->p); + mp_msg(MSGT_CFGPARSER, MSGL_INFO, "%s", mp_gtext(opt->p)); if(opt->priv == NULL) return M_OPT_EXIT; |