diff options
| -rw-r--r-- | options/m_option.c | 9 | ||||
| -rw-r--r-- | options/m_option.h | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/options/m_option.c b/options/m_option.c index 4a32582873..e0dc1b9729 100644 --- a/options/m_option.c +++ b/options/m_option.c @@ -2623,16 +2623,9 @@ bool m_obj_list_find(struct m_obj_desc *dst, const struct m_obj_list *l, for (int i = 0; l->aliases[i][0]; i++) { const char *aname = l->aliases[i][0]; const char *alias = l->aliases[i][1]; - const char *opts = l->aliases[i][2]; if (bstr_equals0(name, aname) && m_obj_list_find(dst, l, bstr0(alias))) { - if (opts) { - dst->init_options = opts; - } else { - // Assume it's deprecated in this case. - // Also, it's used by the VO code only, so whatever. - dst->replaced_name = aname; - } + dst->replaced_name = aname; return true; } } diff --git a/options/m_option.h b/options/m_option.h index 726c080fa9..078e9248b9 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -147,7 +147,7 @@ struct m_obj_list { bool (*get_desc)(struct m_obj_desc *dst, int index); const char *description; // Can be set to a NULL terminated array of aliases - const char *aliases[4][5]; + const char *aliases[5][2]; // Allow a trailing ",", which adds an entry with name="" bool allow_trailer; // Allow unknown entries, for which a dummy entry is inserted, and whose |