zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bad argument passed to fluid_ostream_printf()

This commit is contained in:
jjceresa 2020-09-16 19:26:05 +02:00
parent 2d4d132214
commit c51e23e0ee
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bindings/fluid_cmd.c
View File

@ -3461,8 +3461,7 @@ int fluid_handle_chanmap(void *data, int ac, char **av,
@param av, table of arguments. @param av, table of arguments.
@param out output stream. @param out output stream.
*/ */
int fluid_handle_fxmap(void *data, int ac, char **av, int fluid_handle_fxmap(void *data, int ac, char **av, fluid_ostream_t out)
fluid_ostream_t out)
{ {
static const char header[] ="fx unit , to out\n"; static const char header[] ="fx unit , to out\n";
static const char name_cde[] = "fxmap"; static const char name_cde[] = "fxmap";
@ -3549,7 +3548,7 @@ static int fluid_handle_reset_map(void *data, int ac, char **av,
map_func[RESET_MAP_CHAN] = fluid_handle_chanmap; map_func[RESET_MAP_CHAN] = fluid_handle_chanmap;
map_func[RESET_MAP_FX] = fluid_handle_fxmap; map_func[RESET_MAP_FX] = fluid_handle_fxmap;
/* checks channels arguments: chan1 chan2 .... */ /* checks arguments */
if(check_channels_arguments(ac, av, out, name_cde[resetmap_type]) < 0) if(check_channels_arguments(ac, av, out, name_cde[resetmap_type]) < 0)
{ {
return -1; return -1;
@ -3567,7 +3566,8 @@ static int fluid_handle_reset_map(void *data, int ac, char **av,
if(result == FLUID_FAILED) if(result == FLUID_FAILED)
{ {
fluid_ostream_printf(out, "%s: arg %3d, %s", name_cde, arg, fluid_ostream_printf(out, "%s: arg %3d, %s",
name_cde[resetmap_type], arg,
invalid_arg_msg); invalid_arg_msg);
} }
} }
@ -3591,8 +3591,7 @@ static int fluid_handle_reset_map(void *data, int ac, char **av,
Set default mapping for MIDI channels chan0 chan1 .. Set default mapping for MIDI channels chan0 chan1 ..
*/ */
int fluid_handle_resetchanmap(void *data, int ac, char **av, int fluid_handle_resetchanmap(void *data, int ac, char **av, fluid_ostream_t out)
fluid_ostream_t out)
{ {
return fluid_handle_reset_map(data, ac, av, out, RESET_MAP_CHAN); return fluid_handle_reset_map(data, ac, av, out, RESET_MAP_CHAN);
} }
@ -3606,8 +3605,7 @@ int fluid_handle_resetchanmap(void *data, int ac, char **av,
Set default mapping for fx unit fx0 fx1 .. Set default mapping for fx unit fx0 fx1 ..
*/ */
int fluid_handle_resetfxmap(void *data, int ac, char **av, int fluid_handle_resetfxmap(void *data, int ac, char **av, fluid_ostream_t out)
fluid_ostream_t out)
{ {
return fluid_handle_reset_map(data, ac, av, out, RESET_MAP_FX); return fluid_handle_reset_map(data, ac, av, out, RESET_MAP_FX);
} }
@ -3685,8 +3683,7 @@ static int fluid_handle_set_map(void *data, int ac, char **av,
Set a mapping between a MIDI channel and a dry output index Set a mapping between a MIDI channel and a dry output index
*/ */
int fluid_handle_setchanmapout(void *data, int ac, char **av, int fluid_handle_setchanmapout(void *data, int ac, char **av, fluid_ostream_t out)
fluid_ostream_t out)
{ {
return fluid_handle_set_map(data, ac, av, out, MAP_CHAN_TO_OUT); return fluid_handle_set_map(data, ac, av, out, MAP_CHAN_TO_OUT);
} }
@ -3696,8 +3693,7 @@ int fluid_handle_setchanmapout(void *data, int ac, char **av,
Set a mapping between a MIDI channel and a fx unit input index Set a mapping between a MIDI channel and a fx unit input index
*/ */
int fluid_handle_setchanmapfx(void *data, int ac, char **av, int fluid_handle_setchanmapfx(void *data, int ac, char **av, fluid_ostream_t out)
fluid_ostream_t out)
{ {
return fluid_handle_set_map(data, ac, av, out, MAP_CHAN_TO_FX); return fluid_handle_set_map(data, ac, av, out, MAP_CHAN_TO_FX);
} }