diff --git a/include/fluidsynth/settings.h b/include/fluidsynth/settings.h index 5d1f7cb4..e2782da8 100644 --- a/include/fluidsynth/settings.h +++ b/include/fluidsynth/settings.h @@ -193,7 +193,7 @@ FLUIDSYNTH_API char *fluid_settings_option_concat (fluid_settings_t* settings, * @param name Setting name * @param type Setting type (#fluid_types_enum) */ -typedef void (*fluid_settings_foreach_t)(void *data, char *name, int type); +typedef void (*fluid_settings_foreach_t)(void *data, const char *name, int type); FLUIDSYNTH_API void fluid_settings_foreach(fluid_settings_t* settings, void* data, diff --git a/src/bindings/fluid_cmd.c b/src/bindings/fluid_cmd.c index dcb907ab..4dd28879 100644 --- a/src/bindings/fluid_cmd.c +++ b/src/bindings/fluid_cmd.c @@ -1444,7 +1444,7 @@ struct _fluid_handle_settings_data_t { fluid_ostream_t out; }; -static void fluid_handle_settings_iter1(void* data, char* name, int type) +static void fluid_handle_settings_iter1(void* data, const char* name, int type) { struct _fluid_handle_settings_data_t* d = (struct _fluid_handle_settings_data_t*) data; @@ -1454,7 +1454,7 @@ static void fluid_handle_settings_iter1(void* data, char* name, int type) } } -static void fluid_handle_settings_iter2(void* data, char* name, int type) +static void fluid_handle_settings_iter2(void* data, const char* name, int type) { struct _fluid_handle_settings_data_t* d = (struct _fluid_handle_settings_data_t*) data; diff --git a/src/fluidsynth.c b/src/fluidsynth.c index f20e9d41..196cc5a9 100644 --- a/src/fluidsynth.c +++ b/src/fluidsynth.c @@ -154,7 +154,7 @@ settings_option_foreach_func (void *data, const char *name, const char *option) /* fluid_settings_foreach function for displaying option help "-o help" */ static void -settings_foreach_func (void *data, char *name, int type) +settings_foreach_func (void *data, const char *name, int type) { fluid_settings_t *settings = (fluid_settings_t *)data; double dmin, dmax, ddef; diff --git a/src/utils/fluid_settings.c b/src/utils/fluid_settings.c index 81927b45..a9c320ed 100644 --- a/src/utils/fluid_settings.c +++ b/src/utils/fluid_settings.c @@ -1613,7 +1613,7 @@ fluid_settings_foreach (fluid_settings_t* settings, void* data, { if (fluid_settings_get (settings, (const char *)(p->data), &node) == FLUID_OK && node) - (*func) (data, (char *)(p->data), node->type); + (*func) (data, (const char *)(p->data), node->type); FLUID_FREE (p->data); /* -- Free name */ }