diff options
| -rw-r--r-- | m_config.c | 16 | ||||
| -rw-r--r-- | m_config.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/m_config.c b/m_config.c index 6c08956d96..c1b0543f92 100644 --- a/m_config.c +++ b/m_config.c @@ -29,7 +29,7 @@ static int show_profile(m_option_t *opt, char* name, char *param); static void -m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix); +m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix); static int list_options(m_option_t *opt, char* name, char *param); @@ -182,7 +182,7 @@ m_config_pop(m_config_t* config) { } static void -m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix) { +m_config_add_option(m_config_t *config, const m_option_t *arg, const char* prefix) { m_config_option_t *co; m_config_save_slot_t* sl; @@ -206,7 +206,7 @@ m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix) { // Option with children -> add them if(arg->type->flags & M_OPT_TYPE_HAS_CHILD) { - m_option_t *ol = arg->p; + const m_option_t *ol = arg->p; int i; co->slots = NULL; for(i = 0 ; ol[i].name != NULL ; i++) @@ -246,7 +246,7 @@ m_config_add_option(m_config_t *config, m_option_t *arg, char* prefix) { } int -m_config_register_options(m_config_t *config, m_option_t *args) { +m_config_register_options(m_config_t *config, const m_option_t *args) { int i; #ifdef MP_DEBUG @@ -374,7 +374,7 @@ m_config_check_option(m_config_t *config, char* arg, char* param) { } -m_option_t* +const m_option_t* m_config_get_option(m_config_t *config, char* arg) { m_config_option_t *co; @@ -391,9 +391,9 @@ m_config_get_option(m_config_t *config, char* arg) { return NULL; } -void* +const void* m_config_get_option_ptr(m_config_t *config, char* arg) { - m_option_t* conf; + const m_option_t* conf; #ifdef MP_DEBUG assert(config != NULL); @@ -415,7 +415,7 @@ m_config_print_option_list(m_config_t *config) { mp_msg(MSGT_CFGPARSER, MSGL_INFO, MSGTR_OptionListHeader); for(co = config->opts ; co ; co = co->next) { - m_option_t* opt = co->opt; + const m_option_t* opt = co->opt; if(opt->type->flags & M_OPT_TYPE_HAS_CHILD) continue; if(opt->flags & M_OPT_MIN) sprintf(min,"%-8.0f",opt->min); diff --git a/m_config.h b/m_config.h index 7b4a8db2ee..a1dc550084 100644 --- a/m_config.h +++ b/m_config.h @@ -34,7 +34,7 @@ struct m_config_option { /// Full name (ie option:subopt). char* name; /// Option description. - struct m_option* opt; + const struct m_option* opt; /// Save slot stack. m_config_save_slot_t* slots; /// See \ref ConfigOptionFlags. @@ -120,7 +120,7 @@ m_config_pop(m_config_t* config); * \return 1 on success, 0 on failure. */ int -m_config_register_options(m_config_t *config, struct m_option *args); +m_config_register_options(m_config_t *config, const struct m_option *args); /// Set an option. /** \param config The config object. @@ -144,7 +144,7 @@ m_config_check_option(m_config_t *config, char* arg, char* param); /** \param config The config object. * \param arg The option's name. */ -struct m_option* +const struct m_option* m_config_get_option(m_config_t *config, char* arg); /// Print a list of all registered options. |