RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

better error handling for invalud suboptions 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8895 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2003-01-11 17:32:45 +00:00
parent aa6d0ac08f
commit f58d370b95
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
m_config.c
View File

@ -215,7 +215,7 @@ m_config_parse_option(m_config_t *config, char* arg, char* param,int set) {
co = m_config_get_co(config,arg);
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;
}
@ -241,6 +241,7 @@ m_config_parse_option(m_config_t *config, char* arg, char* param,int set) {
// Parse the child options
r = m_option_parse(co->opt,arg,param,&lst,config->mode);
// Set them now
if(r >= 0)
for(i = 0 ; lst && lst[2*i] ; i++) {
int l = strlen(co->name) + 1 + strlen(lst[2*i]) + 1;
if(r >= 0) {
@ -248,7 +249,13 @@ m_config_parse_option(m_config_t *config, char* arg, char* param,int set) {
char n[l];
sprintf(n,"%s:%s",co->name,lst[2*i]);
sr = m_config_parse_option(config,n,lst[2*i+1],set);
if(sr < 0) r = sr;
if(sr < 0){
if(sr == M_OPT_UNKNOW){
mp_msg(MSGT_CFGPARSER, MSGL_ERR,"Error: option '%s' has no suboption '%s'\n",co->name,lst[2*i]);
r = M_OPT_INVALID;
} else
r = sr;
}
}
free(lst[2*i]);
free(lst[2*i+1]);