diff options
| author | wm4 <wm4@nowhere> | 2016-08-30 23:45:58 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-08-30 23:45:58 +0200 |
| commit | 3bb134969eb624e859a546fd7142fe2eae076346 (patch) | |
| tree | e2a6ae7887661c420252c8eeae7ecbc12caa4a94 /options/m_option.c | |
| parent | 6f6d2eb7705db6e315f7df72db8f81ef7e7d3f35 (diff) | |
| download | mpv-3bb134969eb624e859a546fd7142fe2eae076346.tar.bz2 mpv-3bb134969eb624e859a546fd7142fe2eae076346.tar.xz | |
m_option: remove M_OPT_TYPE_DYNAMIC flag
It's actually redundant with whether m_option_type.free is set. Some
option types were flagged inconsistently. Its only use was for running
an additional sanity check without any real functionality.
Diffstat (limited to 'options/m_option.c')
| -rw-r--r-- | options/m_option.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/options/m_option.c b/options/m_option.c index 0acdc55b0a..94dab9f59f 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -1175,7 +1175,6 @@ static void free_str(void *src) const m_option_type_t m_option_type_string = { .name = "String", .size = sizeof(char *), - .flags = M_OPT_TYPE_DYNAMIC, .parse = parse_str, .print = print_str, .copy = copy_str, @@ -1486,7 +1485,7 @@ const m_option_type_t m_option_type_string_list = { */ .name = "String list", .size = sizeof(char **), - .flags = M_OPT_TYPE_DYNAMIC | M_OPT_TYPE_ALLOW_WILDCARD, + .flags = M_OPT_TYPE_ALLOW_WILDCARD, .parse = parse_str_list, .print = print_str_list, .copy = copy_str_list, @@ -1522,7 +1521,6 @@ static int parse_str_append_list(struct mp_log *log, const m_option_t *opt, const m_option_type_t m_option_type_string_append_list = { .name = "String list", .size = sizeof(char **), - .flags = M_OPT_TYPE_DYNAMIC, .parse = parse_str_append_list, .print = print_str_list, .copy = copy_str_list, @@ -1636,7 +1634,6 @@ static int keyvalue_list_get(const m_option_t *opt, void *ta_parent, const m_option_type_t m_option_type_keyvalue_list = { .name = "Key/value list", .size = sizeof(char **), - .flags = M_OPT_TYPE_DYNAMIC, .parse = parse_keyvalue_list, .print = print_keyvalue_list, .copy = copy_str_list, @@ -1703,7 +1700,6 @@ static int set_msglevels(const m_option_t *opt, void *dst, const m_option_type_t m_option_type_msglevels = { .name = "Output verbosity levels", .size = sizeof(char **), - .flags = M_OPT_TYPE_DYNAMIC, .parse = parse_msglevels, .print = print_keyvalue_list, .copy = copy_str_list, @@ -3284,7 +3280,7 @@ static int get_obj_settings_list(const m_option_t *opt, void *ta_parent, const m_option_type_t m_option_type_obj_settings_list = { .name = "Object settings list", .size = sizeof(m_obj_settings_t *), - .flags = M_OPT_TYPE_DYNAMIC | M_OPT_TYPE_ALLOW_WILDCARD, + .flags = M_OPT_TYPE_ALLOW_WILDCARD, .parse = parse_obj_settings_list, .print = print_obj_settings_list, .copy = copy_obj_settings_list, @@ -3405,7 +3401,6 @@ static int node_get(const m_option_t *opt, void *ta_parent, const m_option_type_t m_option_type_node = { .name = "Complex", .size = sizeof(struct mpv_node), - .flags = M_OPT_TYPE_DYNAMIC, .parse = parse_node, .print = print_node, .copy = copy_node, |