diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:46:46 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:50:55 +0200 |
| commit | e74708f6194ef0af2bdf37e857ed232027fa46ba (patch) | |
| tree | f7b53476abeb1cc8ccbe1c49113e9722c51b7800 /m_config.c | |
| parent | 2ad00b5319603b22f9b0858bb14d016f673157cb (diff) | |
| parent | cb8796857c8bd851e3b97d729af149e3f003b851 (diff) | |
| download | mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.bz2 mpv-e74708f6194ef0af2bdf37e857ed232027fa46ba.tar.xz | |
Merge svn changes up to r30748
Diffstat (limited to 'm_config.c')
| -rw-r--r-- | m_config.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/m_config.c b/m_config.c index 6b8a05a264..daac69018d 100644 --- a/m_config.c +++ b/m_config.c @@ -38,10 +38,10 @@ #define MAX_PROFILE_DEPTH 20 static int -parse_profile(const m_option_t *opt, const char *name, char *param, void *dst, int src); +parse_profile(const m_option_t *opt, const char *name, const char *param, void *dst, int src); static void -set_profile(const m_option_t *opt, void* dst, void* src); +set_profile(const m_option_t *opt, void* dst, const void* src); static int show_profile(m_option_t *opt, char* name, char *param); @@ -56,13 +56,13 @@ static void m_option_save(const m_config_t *config, const m_option_t *opt, void *dst) { if (opt->type->save) { - void *src = opt->new ? (char*)config->optstruct + opt->offset : opt->p; + const void *src = opt->new ? (char*)config->optstruct + opt->offset : opt->p; opt->type->save(opt, dst, src); } } static void m_option_set(const m_config_t *config, const m_option_t *opt, - void *src) + const void *src) { if (opt->type->set) { void *dst = opt->new ? (char*)config->optstruct + opt->offset : opt->p; @@ -505,7 +505,7 @@ m_config_set_profile(m_config_t* config, m_profile_t* p) { } static int -parse_profile(const m_option_t *opt, const char *name, char *param, void *dst, int src) +parse_profile(const m_option_t *opt, const char *name, const char *param, void *dst, int src) { m_config_t* config = opt->priv; char** list = NULL; @@ -541,7 +541,7 @@ parse_profile(const m_option_t *opt, const char *name, char *param, void *dst, i } static void -set_profile(const m_option_t *opt, void *dst, void *src) { +set_profile(const m_option_t *opt, void *dst, const void *src) { m_config_t* config = opt->priv; m_profile_t* p; char** list = NULL; |