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

subopt-helper: support "no-" prefix to negate suboptions 

Support "no-" prefix to negate boolean suboptions in the subopt helper
(used to parse VO etc suboptions). Previously only "no" was supported,
unlike toplevel options which gained "no-" support earlier.
This commit is contained in:
Uoti Urpala 2011-11-06 09:09:39 +02:00
parent 505f94cef9
commit fb3d13058f
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
subopt-helper.c
View File

@ -260,23 +260,24 @@ int subopt_parse( char const * const str, const opt_t * opts )
parse_pos = last - str;
}
}
}
else if ( substr_len == opt_len+2 )
{
if ( opts[idx].type == OPT_ARG_BOOL && // check for no<opt>
strncmp( &str[parse_pos], "no", 2 ) == 0 &&
strncmp( &str[parse_pos+2], opts[idx].name, opt_len ) == 0 )
{
/* option was found but negated */
next = 1;
}
else if (opts[idx].type == OPT_ARG_BOOL) {
// check for no-<opt>
for (char **p = (char *[]){"no-", "no", NULL}; *p; p++) {
if (substr_len == opt_len + strlen(*p) &&
!strncmp(str + parse_pos, *p, strlen(*p)) &&
!strncmp(str + parse_pos + strlen(*p), opts[idx].name, opt_len)) {
/* option was found but negated */
next = 1;
/* set arg to false */
*((int *)(opts[idx].valp)) = 0;
/* set arg to false */
*((int *)(opts[idx].valp)) = 0;
/* increment position */
parse_pos += opt_len+2;
parse_pos += opt_len + strlen(*p);
break;
}
}
}
}
++idx; // test against next option