zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-06-02 01:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make const string really const (#536)

Browse source
This commit is contained in:
Carlo Bramini 2019-06-09 12:30:43 +02:00 • committed by Tom M
parent 484c4680bf
commit 580a4d16e0
2 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/bindings/fluid_cmd.c
View file

@ -2459,9 +2459,11 @@ int fluid_handle_router_par2(void *data, int ac, char **av, fluid_ostream_t out)
/** commands Poly/mono mode *************************************************/ /** commands Poly/mono mode *************************************************/
static const char *mode_name[] = {"poly omni on (0)", "mono omni on (1)", static const char *const mode_name[] = {
"poly omni on (0)", "mono omni on (1)",
"poly omni off(2)", "mono omni off(3)" "poly omni off(2)", "mono omni off(3)"
}; };
/* /*
Prints result message for commands: basicchannels, resetbasicchannels. Prints result message for commands: basicchannels, resetbasicchannels.
Prints all basic channels and print a warning if there is no basic channel. Prints all basic channels and print a warning if there is no basic channel.
@ -2535,7 +2537,7 @@ static int get_channel_mode_num(char *name)
{ {
/* argument names for channel mode parameter (see resetbasicchannels and /* argument names for channel mode parameter (see resetbasicchannels and
setbasicchannels commands*/ setbasicchannels commands*/
static const char *name_channel_mode [FLUID_CHANNEL_MODE_LAST] = static const char * const name_channel_mode [FLUID_CHANNEL_MODE_LAST] =
{"poly_omnion", "mono_omnion", "poly_omnioff", "mono_omnioff"}; {"poly_omnion", "mono_omnion", "poly_omnioff", "mono_omnioff"};
int i; int i;
@ -2550,7 +2552,7 @@ static int get_channel_mode_num(char *name)
return -1; return -1;
} }
static const char *invalid_arg_msg = "invalid argument\n"; static const char invalid_arg_msg[] = "invalid argument\n";
/* /*
checks basic channels arguments: chan1 mode1 val chan2 mode2 val2 ... checks basic channels arguments: chan1 mode1 val chan2 mode2 val2 ...
All arguments can be numeric. mode parameter can be a name. All arguments can be numeric. mode parameter can be a name.
@ -2565,7 +2567,7 @@ static const char *invalid_arg_msg = "invalid argument\n";
static int check_basicchannels_arguments(int ac, char **av, static int check_basicchannels_arguments(int ac, char **av,
fluid_ostream_t out, char const *name_cde) fluid_ostream_t out, char const *name_cde)
{ {
static const char *too_few_arg_msg = "too few argument, chan mode val [chan mode val]...\n"; static const char too_few_arg_msg[] = "too few argument, chan mode val [chan mode val]...\n";
int i; int i;
for(i = 0; i < ac; i++) for(i = 0; i < ac; i++)
@ -2632,7 +2634,7 @@ static int check_channels_arguments(int ac, char **av,
int fluid_handle_resetbasicchannels(void *data, int ac, char **av, int fluid_handle_resetbasicchannels(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "resetbasicchannels"; static const char name_cde[] = "resetbasicchannels";
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
fluid_synth_t *synth = handler->synth; fluid_synth_t *synth = handler->synth;
@ -2688,7 +2690,7 @@ int fluid_handle_resetbasicchannels(void *data, int ac, char **av,
int fluid_handle_setbasicchannels(void *data, int ac, char **av, int fluid_handle_setbasicchannels(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "setbasicchannels"; static const char name_cde[] = "setbasicchannels";
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
fluid_synth_t *synth = handler->synth; fluid_synth_t *synth = handler->synth;
int result; int result;
@ -2788,9 +2790,9 @@ static void print_channel_is_outside_count(fluid_ostream_t out, char const *name
int fluid_handle_channelsmode(void *data, int ac, char **av, int fluid_handle_channelsmode(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *header = static const char header[] =
"Channel , Status , Type , Mode , Nbr of channels\n"; "Channel , Status , Type , Mode , Nbr of channels\n";
static const char *name_cde = "channelsmode"; static const char name_cde[] = "channelsmode";
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
fluid_synth_t *synth = handler->synth; fluid_synth_t *synth = handler->synth;
@ -2828,7 +2830,7 @@ int fluid_handle_channelsmode(void *data, int ac, char **av,
const char *p_basicchan; /* field basic channel */ const char *p_basicchan; /* field basic channel */
const char *p_mode; /* field mode */ const char *p_mode; /* field mode */
const char *p_nbr; /* field Nbr */ const char *p_nbr; /* field Nbr */
static const char *blank = "--"; /* field empty */ static const char blank[] = "--"; /* field empty */
if(chan == basic_chan) if(chan == basic_chan)
{ {
@ -2922,8 +2924,8 @@ static void print_result_get_channel_mode(int result, fluid_ostream_t out,
int fluid_handle_legatomode(void *data, int ac, char **av, int fluid_handle_legatomode(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "legatomode"; static const char name_cde[] = "legatomode";
static const char *name_legato_mode[FLUID_CHANNEL_LEGATO_MODE_LAST] = static const char *const name_legato_mode[FLUID_CHANNEL_LEGATO_MODE_LAST] =
{ "(0)retrigger", "(1)multi-retrigger" }; { "(0)retrigger", "(1)multi-retrigger" };
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
@ -3024,7 +3026,7 @@ static void print_result_set_channel_mode(int result, fluid_ostream_t out,
} }
} }
static const char *too_few_arg_chan_mode_msg = "too few argument, chan mode [chan mode]...\n"; static const char too_few_arg_chan_mode_msg[] = "too few argument, chan mode [chan mode]...\n";
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
setlegatomode chan0 mode1 [chan1 mode0] .. .. setlegatomode chan0 mode1 [chan1 mode0] .. ..
@ -3033,7 +3035,7 @@ static const char *too_few_arg_chan_mode_msg = "too few argument, chan mode [cha
int fluid_handle_setlegatomode(void *data, int ac, char **av, int fluid_handle_setlegatomode(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "setlegatomode"; static const char name_cde[] = "setlegatomode";
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
fluid_synth_t *synth = handler->synth; fluid_synth_t *synth = handler->synth;
int i, n ; int i, n ;
@ -3078,8 +3080,8 @@ int fluid_handle_setlegatomode(void *data, int ac, char **av,
int fluid_handle_portamentomode(void *data, int ac, char **av, int fluid_handle_portamentomode(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "portamentomode"; static const char name_cde[] = "portamentomode";
static const char *name_portamento_mode[FLUID_CHANNEL_PORTAMENTO_MODE_LAST] = static const char *const name_portamento_mode[FLUID_CHANNEL_PORTAMENTO_MODE_LAST] =
{ "(0)each note", "(1)legato only", "(2)staccato only" }; { "(0)each note", "(1)legato only", "(2)staccato only" };
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
@ -3123,7 +3125,7 @@ int fluid_handle_portamentomode(void *data, int ac, char **av,
int fluid_handle_setportamentomode(void *data, int ac, char **av, int fluid_handle_setportamentomode(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "setportamentomode"; static const char name_cde[] = "setportamentomode";
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
fluid_synth_t *synth = handler->synth; fluid_synth_t *synth = handler->synth;
int i, n ; int i, n ;
@ -3169,8 +3171,8 @@ int fluid_handle_setportamentomode(void *data, int ac, char **av,
int fluid_handle_breathmode(void *data, int ac, char **av, int fluid_handle_breathmode(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "breathmode"; static const char name_cde[] = "breathmode";
static const char *header = "Channel , poly breath , mono breath , breath sync\n"; static const char *const header = "Channel , poly breath , mono breath , breath sync\n";
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);
fluid_synth_t *synth = handler->synth; fluid_synth_t *synth = handler->synth;
int breathmode; int breathmode;
@ -3201,8 +3203,8 @@ int fluid_handle_breathmode(void *data, int ac, char **av,
if(result == FLUID_OK) if(result == FLUID_OK)
{ {
static const char *on_msg = "on"; static const char on_msg[] = "on";
static const char *off_msg = "off"; static const char off_msg[] = "off";
const char *msg_poly_breath, * msg_mono_breath, * msg_breath_sync; const char *msg_poly_breath, * msg_mono_breath, * msg_breath_sync;
if(breathmode & FLUID_CHANNEL_BREATH_POLY) if(breathmode & FLUID_CHANNEL_BREATH_POLY)
@ -3265,8 +3267,8 @@ int fluid_handle_breathmode(void *data, int ac, char **av,
int fluid_handle_setbreathmode(void *data, int ac, char **av, int fluid_handle_setbreathmode(void *data, int ac, char **av,
fluid_ostream_t out) fluid_ostream_t out)
{ {
static const char *name_cde = "setbreathmode"; static const char name_cde[] = "setbreathmode";
static const char *too_few_arg_breath_msg = static const char too_few_arg_breath_msg[] =
"too few argument:\nchan 1/0(breath poly) 1/0(breath mono) 1/0(breath sync mono)[..]\n"; "too few argument:\nchan 1/0(breath poly) 1/0(breath mono) 1/0(breath sync mono)[..]\n";
FLUID_ENTRY_COMMAND(data); FLUID_ENTRY_COMMAND(data);

6
src/synth/fluid_mod.c
View file

@ -605,11 +605,11 @@ fluid_mod_check_cc_source(const fluid_mod_t *mod, unsigned char src1_select)
*/ */
int fluid_mod_check_sources(const fluid_mod_t *mod, char *name) int fluid_mod_check_sources(const fluid_mod_t *mod, char *name)
{ {
static const char *invalid_non_cc_src = static const char invalid_non_cc_src[] =
"Invalid modulator, using non-CC source %s.src%d=%d"; "Invalid modulator, using non-CC source %s.src%d=%d";
static const char *invalid_cc_src = static const char invalid_cc_src[] =
"Invalid modulator, using CC source %s.src%d=%d"; "Invalid modulator, using CC source %s.src%d=%d";
static const char *src1_is_none = static const char src1_is_none[] =
"Modulator with source 1 none %s.src1=%d"; "Modulator with source 1 none %s.src1=%d";
/* checks valid non cc sources */ /* checks valid non cc sources */