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

options: sort --list-options 

Until now, --list-options printed options in random order. There
literally wasn't any logic in its order, they just appeared as they were
declared. So just sort them.

Note that we can't sort them in advance, because for certain things
internal to m_config, the order actually matters.

Also we're using strcasecmp(), which is bad (locale dependent), but this
is output intended for human consumption, so it's not a problem.
This commit is contained in:
wm4 2014-04-11 01:39:30 +02:00
parent 333c8cbc29
commit 2c2c1203c3
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
options/m_config.c
View File

@ -657,15 +657,26 @@ int m_config_option_requires_param(struct m_config *config, bstr name)
return M_OPT_UNKNOWN; return M_OPT_UNKNOWN;
} }
static int sort_opt_compare(const void *pa, const void *pb)
{
const struct m_config_option *a = pa;
const struct m_config_option *b = pb;
return strcasecmp(a->name, b->name);
}
void m_config_print_option_list(const struct m_config *config) void m_config_print_option_list(const struct m_config *config)
{ {
char min[50], max[50]; char min[50], max[50];
int count = 0; int count = 0;
const char *prefix = config->is_toplevel ? "--" : ""; const char *prefix = config->is_toplevel ? "--" : "";
struct m_config_option *sorted =
talloc_memdup(NULL, config->opts, config->num_opts * sizeof(sorted[0]));
qsort(sorted, config->num_opts, sizeof(sorted[0]), sort_opt_compare);
MP_INFO(config, "Options:\n\n"); MP_INFO(config, "Options:\n\n");
for (int i = 0; i < config->num_opts; i++) { for (int i = 0; i < config->num_opts; i++) {
struct m_config_option *co = &config->opts[i]; struct m_config_option *co = &sorted[i];
const struct m_option *opt = co->opt; const struct m_option *opt = co->opt;
if (opt->type->flags & M_OPT_TYPE_HAS_CHILD) if (opt->type->flags & M_OPT_TYPE_HAS_CHILD)
continue; continue;
@ -706,6 +717,7 @@ void m_config_print_option_list(const struct m_config *config)
count++; count++;
} }
MP_INFO(config, "\nTotal: %d options\n", count); MP_INFO(config, "\nTotal: %d options\n", count);
talloc_free(sorted);
} }
char **m_config_list_options(void *ta_parent, const struct m_config *config) char **m_config_list_options(void *ta_parent, const struct m_config *config)