From 3f061dd62912728bf152c06e7c27b43a3cef312d Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 21 May 2018 00:11:48 +0200 Subject: m_config: remove unused fields --- options/m_config.c | 5 ++--- options/m_config.h | 5 ----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/options/m_config.c b/options/m_config.c index 92f1009aec..c6f4325287 100644 --- a/options/m_config.c +++ b/options/m_config.c @@ -304,8 +304,7 @@ struct m_config *m_config_new(void *talloc_ctx, struct mp_log *log, { struct m_config *config = talloc(talloc_ctx, struct m_config); talloc_set_destructor(config, config_destroy); - *config = (struct m_config) - {.log = log, .size = size, .defaults = defaults, .options = options}; + *config = (struct m_config){.log = log,}; struct m_sub_options *subopts = talloc_ptrtype(config, subopts); *subopts = (struct m_sub_options){ @@ -1233,7 +1232,7 @@ struct mpv_node m_config_get_profiles(struct m_config *config) void m_config_create_shadow(struct m_config *config) { - assert(config->global && config->options && config->size); + assert(config->global); assert(!config->shadow && !config->global->config); config->shadow = talloc_zero(NULL, struct m_config_shadow); diff --git a/options/m_config.h b/options/m_config.h index 2c4531ff86..8a8dba8461 100644 --- a/options/m_config.h +++ b/options/m_config.h @@ -60,11 +60,6 @@ typedef struct m_config { struct m_config_option *opts; // all options, even suboptions int num_opts; - // Creation parameters - size_t size; - const void *defaults; - const struct m_option *options; - // List of defined profiles. struct m_profile *profiles; // Depth when recursively including profiles. -- cgit v1.2.3