make fluid_settings_foreach_t const correct

This commit is contained in:
derselbst 2017-11-11 11:09:17 +01:00
parent 12a9692211
commit c7a02bd812
4 changed files with 5 additions and 5 deletions

View file

@ -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,

View file

@ -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;

View file

@ -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;

View file

@ -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 */
}