Mercurial > mplayer.hg
changeset 10595:522afd56703c
100l to albeu for his english grammar, and 10l to me becouse I noticed that lately (my backward compatibilty macro uses M_OPT_UNKNOWN)
| author | alex |
|---|---|
| date | Wed, 13 Aug 2003 16:45:02 +0000 |
| parents | 57bdcdb061d7 |
| children | 14695e4f37fc |
| files | libvo/vo_aa.c m_config.c m_option.c m_option.h parser-cfg.c parser-mecmd.c parser-mpcmd.c |
| diffstat | 7 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_aa.c Wed Aug 13 16:29:32 2003 +0000 +++ b/libvo/vo_aa.c Wed Aug 13 16:45:02 2003 +0000 @@ -666,7 +666,7 @@ return 1; /* all opt & params accepted */ } - return M_OPT_UNKNOW; + return M_OPT_UNKNOWN; }
--- a/m_config.c Wed Aug 13 16:29:32 2003 +0000 +++ b/m_config.c Wed Aug 13 16:45:02 2003 +0000 @@ -229,7 +229,7 @@ co = m_config_get_co(config,arg); if(!co){ // mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Unknown option: %s\n",arg); - return M_OPT_UNKNOW; + return M_OPT_UNKNOWN; } #ifdef MP_DEBUG @@ -263,7 +263,7 @@ sprintf(n,"%s:%s",co->name,lst[2*i]); sr = m_config_parse_option(config,n,lst[2*i+1],set); if(sr < 0){ - if(sr == M_OPT_UNKNOW){ + if(sr == M_OPT_UNKNOWN){ mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' has no suboption '%s'\n",co->name,lst[2*i]); r = M_OPT_INVALID; } else
--- a/m_option.c Wed Aug 13 16:29:32 2003 +0000 +++ b/m_option.c Wed Aug 13 16:45:02 2003 +0000 @@ -491,7 +491,7 @@ else if(strcasecmp(n,"-clr") == 0) op = OP_CLR; else - return M_OPT_UNKNOW; + return M_OPT_UNKNOWN; } // Clear the list ?? @@ -870,7 +870,7 @@ } if(!subopts[i].name) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Unknown suboption %s\n",name,subopt); - return M_OPT_UNKNOW; + return M_OPT_UNKNOWN; } r = m_option_parse(&subopts[i],subopt, subparam[0] == 0 ? NULL : subparam,NULL,src); @@ -1030,7 +1030,7 @@ opt = m_option_list_find(desc->fields,str); if(!opt) { mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: %s doesn't have a %s parameter\n",opt_name,obj_name,str); - return M_OPT_UNKNOW; + return M_OPT_UNKNOWN; } r = m_option_parse(opt,str,p,NULL,M_CONFIG_FILE); if(r < 0) { @@ -1356,7 +1356,7 @@ " %3$s-clr\n" " Clear the cureent list.\n",name,n,prefix); - return M_OPT_UNKNOW; + return M_OPT_UNKNOWN; } } @@ -1385,7 +1385,7 @@ break; default: mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: FIXME\n",name); - return M_OPT_UNKNOW; + return M_OPT_UNKNOWN; } if(!strcmp(param,"help")) {
--- a/m_option.h Wed Aug 13 16:29:32 2003 +0000 +++ b/m_option.h Wed Aug 13 16:45:02 2003 +0000 @@ -207,7 +207,7 @@ #define M_COMMAND_LINE 1 // Option parser error code -#define M_OPT_UNKNOW -1 +#define M_OPT_UNKNOWN -1 #define M_OPT_MISSING_PARAM -2 #define M_OPT_INVALID -3 #define M_OPT_OUT_OF_RANGE -4
--- a/parser-cfg.c Wed Aug 13 16:29:32 2003 +0000 +++ b/parser-cfg.c Wed Aug 13 16:45:02 2003 +0000 @@ -187,7 +187,7 @@ tmp = m_config_set_option(config, opt, param); if (tmp < 0) { PRINT_LINENUM; - if(tmp == M_OPT_UNKNOW) { + if(tmp == M_OPT_UNKNOWN) { mp_msg(MSGT_CFGPARSER,MSGL_WARN,"Warning unknown option %s at line %d\n", opt,line_num); continue; }
--- a/parser-mecmd.c Wed Aug 13 16:29:32 2003 +0000 +++ b/parser-mecmd.c Wed Aug 13 16:45:02 2003 +0000 @@ -86,7 +86,7 @@ mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "this_opt = option: %s\n", opt); mp_opt = m_config_get_option(config,opt); if(!mp_opt) { - tmp = M_OPT_UNKNOW; + tmp = M_OPT_UNKNOWN; mp_msg(MSGT_CFGPARSER, MSGL_ERR, "%s is not an MEncoder option\n",opt); goto err_out; }