github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-09-28 17:52:52 +02:00
Code Releases Activity

m_option: remove string list -append action code duplication

Browse Source 
Instead of duplicating the append code, reimplement it using the
existing code. The difference between -add and -append is that -append
does not take multiple items (thus removing the need for escaping), but
-append can reuse all code for -add by pretending the separator is never
found.
This commit is contained in:
wm4 2018-01-24 04:54:48 +01:00 committed by Kevin Mitchell
parent d8b013d458
commit 415fc6e327
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
options/m_option.c
View File

@ -1301,7 +1301,7 @@ static struct bstr get_nextsep(struct bstr *ptr, char sep, bool modify)
struct bstr str = *ptr; struct bstr str = *ptr;
struct bstr orig = str; struct bstr orig = str;
for (;;) { for (;;) {
int idx = bstrchr(str, sep); int idx = sep ? bstrchr(str, sep) : -1;
if (idx > 0 && str.start[idx - 1] == '\\') { if (idx > 0 && str.start[idx - 1] == '\\') {
if (modify) { if (modify) {
memmove(str.start + idx - 1, str.start + idx, str.len - idx); memmove(str.start + idx - 1, str.start + idx, str.len - idx);
@ -1324,11 +1324,13 @@ static int parse_str_list_impl(struct mp_log *log, const m_option_t *opt,
{ {
char **res; char **res;
int op = default_op; int op = default_op;
bool multi = true;
if (bstr_endswith0(name, "-add")) { if (bstr_endswith0(name, "-add")) {
op = OP_ADD; op = OP_ADD;
} else if (bstr_endswith0(name, "-append")) { } else if (bstr_endswith0(name, "-append")) {
op = OP_ADD_STR; op = OP_ADD;
multi = false;
} else if (bstr_endswith0(name, "-pre")) { } else if (bstr_endswith0(name, "-pre")) {
op = OP_PRE; op = OP_PRE;
} else if (bstr_endswith0(name, "-del")) { } else if (bstr_endswith0(name, "-del")) {
@ -1350,20 +1352,9 @@ static int parse_str_list_impl(struct mp_log *log, const m_option_t *opt,
if (param.len == 0 && op != OP_NONE) if (param.len == 0 && op != OP_NONE)
return M_OPT_MISSING_PARAM; return M_OPT_MISSING_PARAM;
if (op == OP_ADD_STR) {
if (dst) {
char **list= VAL(dst);
int len = 0;
while (list && list[len])
len++;
MP_TARRAY_APPEND(NULL, list, len, bstrto0(NULL, param));
MP_TARRAY_APPEND(NULL, list, len, NULL);
VAL(dst) = list;
}
return 1;
}
char separator = opt->priv ? *(char *)opt->priv : OPTION_LIST_SEPARATOR; char separator = opt->priv ? *(char *)opt->priv : OPTION_LIST_SEPARATOR;
if (!multi)
separator = 0; // specially handled
int n = 0; int n = 0;
struct bstr str = param; struct bstr str = param;
while (str.len) { while (str.len) {