RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 05:22:23 +00:00
Code Issues Releases Wiki Activity

100l to albeu for his english grammar, and 10l to me becouse I noticed that lately (my backward compatibilty macro uses M_OPT_UNKNOWN)

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10596 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
alex 2003-08-13 16:45:02 +00:00
parent 2283b6305f
commit 1c4586e8f9
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvo/vo_aa.c
View File

@ -666,7 +666,7 @@ vo_aa_parseoption(m_option_t * conf, char *opt, char *param){
return 1; /* all opt & params accepted */ return 1; /* all opt & params accepted */
} }
return M_OPT_UNKNOW; return M_OPT_UNKNOWN;
} }

4
m_config.c
View File

@ -229,7 +229,7 @@ m_config_parse_option(m_config_t *config, char* arg, char* param,int set) {
co = m_config_get_co(config,arg); co = m_config_get_co(config,arg);
if(!co){ if(!co){
// mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Unknown option: %s\n",arg); // mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Unknown option: %s\n",arg);
return M_OPT_UNKNOW; return M_OPT_UNKNOWN;
} }
#ifdef MP_DEBUG #ifdef MP_DEBUG
@ -263,7 +263,7 @@ m_config_parse_option(m_config_t *config, char* arg, char* param,int set) {
sprintf(n,"%s:%s",co->name,lst[2*i]); sprintf(n,"%s:%s",co->name,lst[2*i]);
sr = m_config_parse_option(config,n,lst[2*i+1],set); sr = m_config_parse_option(config,n,lst[2*i+1],set);
if(sr < 0){ 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]); mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' has no suboption '%s'\n",co->name,lst[2*i]);
r = M_OPT_INVALID; r = M_OPT_INVALID;
} else } else

10
m_option.c
View File

@ -491,7 +491,7 @@ static int parse_str_list(m_option_t* opt,char *name, char *param, void* dst, in
else if(strcasecmp(n,"-clr") == 0) else if(strcasecmp(n,"-clr") == 0)
op = OP_CLR; op = OP_CLR;
else else
return M_OPT_UNKNOW; return M_OPT_UNKNOWN;
} }
// Clear the list ?? // Clear the list ??
@ -870,7 +870,7 @@ static int parse_subconf(m_option_t* opt,char *name, char *param, void* dst, int
} }
if(!subopts[i].name) { if(!subopts[i].name) {
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: Unknown suboption %s\n",name,subopt); 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, r = m_option_parse(&subopts[i],subopt,
subparam[0] == 0 ? NULL : subparam,NULL,src); subparam[0] == 0 ? NULL : subparam,NULL,src);
@ -1030,7 +1030,7 @@ static int get_obj_param(char* opt_name,char* obj_name, m_struct_t* desc,
opt = m_option_list_find(desc->fields,str); opt = m_option_list_find(desc->fields,str);
if(!opt) { if(!opt) {
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option %s: %s doesn't have a %s parameter\n",opt_name,obj_name,str); 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); r = m_option_parse(opt,str,p,NULL,M_CONFIG_FILE);
if(r < 0) { if(r < 0) {
@ -1356,7 +1356,7 @@ static int parse_obj_settings_list(m_option_t* opt,char *name,
" %3$s-clr\n" " %3$s-clr\n"
" Clear the cureent list.\n",name,n,prefix); " Clear the cureent list.\n",name,n,prefix);
return M_OPT_UNKNOW; return M_OPT_UNKNOWN;
} }
} }
@ -1385,7 +1385,7 @@ static int parse_obj_settings_list(m_option_t* opt,char *name,
break; break;
default: default:
mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: FIXME\n",name); mp_msg(MSGT_VFILTER,MSGL_ERR, "Option %s: FIXME\n",name);
return M_OPT_UNKNOW; return M_OPT_UNKNOWN;
} }
if(!strcmp(param,"help")) { if(!strcmp(param,"help")) {

2
m_option.h
View File

@ -207,7 +207,7 @@ struct m_option {
#define M_COMMAND_LINE 1 #define M_COMMAND_LINE 1
// Option parser error code // Option parser error code
#define M_OPT_UNKNOW -1 #define M_OPT_UNKNOWN -1
#define M_OPT_MISSING_PARAM -2 #define M_OPT_MISSING_PARAM -2
#define M_OPT_INVALID -3 #define M_OPT_INVALID -3
#define M_OPT_OUT_OF_RANGE -4 #define M_OPT_OUT_OF_RANGE -4

2
parser-cfg.c
View File

@ -187,7 +187,7 @@ int m_config_parse_config_file(m_config_t* config, char *conffile)
tmp = m_config_set_option(config, opt, param); tmp = m_config_set_option(config, opt, param);
if (tmp < 0) { if (tmp < 0) {
PRINT_LINENUM; 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); mp_msg(MSGT_CFGPARSER,MSGL_WARN,"Warning unknown option %s at line %d\n", opt,line_num);
continue; continue;
} }

2
parser-mecmd.c
View File

@ -86,7 +86,7 @@ m_config_parse_me_command_line(m_config_t *config, int argc, char **argv)
mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "this_opt = option: %s\n", opt); mp_msg(MSGT_CFGPARSER, MSGL_DBG3, "this_opt = option: %s\n", opt);
mp_opt = m_config_get_option(config,opt); mp_opt = m_config_get_option(config,opt);
if(!mp_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); mp_msg(MSGT_CFGPARSER, MSGL_ERR, "%s is not an MEncoder option\n",opt);
goto err_out; goto err_out;
} }

2
parser-mpcmd.c
View File

@ -179,7 +179,7 @@ m_config_parse_mp_command_line(m_config_t *config, int argc, char **argv)
} }
} }
} else { } else {
tmp = M_OPT_UNKNOW; tmp = M_OPT_UNKNOWN;
mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Unknown option on the command line: %s\n",opt); mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Unknown option on the command line: %s\n",opt);
} }
} }