summaryrefslogtreecommitdiffstats
path: root/core/m_config.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-31 20:44:34 +0200
committerwm4 <wm4@nowhere>2013-07-31 20:55:59 +0200
commita8a0c5023b915897066cc72c472eb9def0b34efb (patch)
tree8d534308371a091ab61a0281aa353322a0c32356 /core/m_config.h
parent0656411e97afd5710b02563ee0b28423443592e9 (diff)
downloadmpv-a8a0c5023b915897066cc72c472eb9def0b34efb.tar.bz2
mpv-a8a0c5023b915897066cc72c472eb9def0b34efb.tar.xz
m_config: remove alias information
We don't need to store anymore whether an option is aliased by another option (which is what the alias_owner member did). Also, that member had a really bad name. This also removes some unneeded code from config_destroy(). Calling m_option_free() is always ok; this just skipped the call if it did nothing. In particular, it's ok to call m_option_free() on the same pointer multiple times. (Maybe that function is misnamed, and it should be m_option_clear().)
Diffstat (limited to 'core/m_config.h')
-rw-r--r--core/m_config.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/m_config.h b/core/m_config.h
index 1ee7ecf1c0..dbc334c3aa 100644
--- a/core/m_config.h
+++ b/core/m_config.h
@@ -46,10 +46,6 @@ struct m_config_option {
void *data;
// If this is a suboption, the option that contains this option.
struct m_config_option *parent;
- // If this option aliases another, more important option. The alias_owner
- // option is the one that has the most correct option type for the data
- // variable, and which is considered the original.
- struct m_config_option *alias_owner;
};
// Config object