mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2026-02-08 10:06:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Make string arrays as constant as possible.

Browse source 
Use "const char *const []" as type for string arrays, or convert to
"const char [][x]" when it makes sense.

Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>
This commit is contained in:
Diego E. 'Flameeyes' Pettenò 2008-11-21 19:46:44 +01:00
parent 2eaf9403d2
commit fc8d8bb2e6
4 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/control/control.c
View file

@ -757,7 +757,7 @@ snd_ctl_t *snd_async_handler_get_ctl(snd_async_handler_t *handler)
return handler->u.ctl; return handler->u.ctl;
} }
static const char *build_in_ctls[] = { static const char *const build_in_ctls[] = {
"hw", "shm", NULL "hw", "shm", NULL
}; };
@ -842,7 +842,7 @@ static int snd_ctl_open_conf(snd_ctl_t **ctlp, const char *name,
sprintf(buf, "_snd_ctl_%s_open", str); sprintf(buf, "_snd_ctl_%s_open", str);
} }
if (!lib) { if (!lib) {
const char **build_in = build_in_ctls; const char *const *build_in = build_in_ctls;
while (*build_in) { while (*build_in) {
if (!strcmp(*build_in, str)) if (!strcmp(*build_in, str))
break; break;
@ -952,7 +952,7 @@ int snd_ctl_open_lconf(snd_ctl_t **ctlp, const char *name,
#define IFACE1(v, n) [SND_CTL_ELEM_IFACE_##v] = #n #define IFACE1(v, n) [SND_CTL_ELEM_IFACE_##v] = #n
#define EVENT(v) [SND_CTL_EVENT_##v] = #v #define EVENT(v) [SND_CTL_EVENT_##v] = #v
static const char *snd_ctl_elem_type_names[] = { static const char *const snd_ctl_elem_type_names[] = {
TYPE(NONE), TYPE(NONE),
TYPE(BOOLEAN), TYPE(BOOLEAN),
TYPE(INTEGER), TYPE(INTEGER),
@ -962,7 +962,7 @@ static const char *snd_ctl_elem_type_names[] = {
TYPE(INTEGER64), TYPE(INTEGER64),
}; };
static const char *snd_ctl_elem_iface_names[] = { static const char *const snd_ctl_elem_iface_names[] = {
IFACE(CARD), IFACE(CARD),
IFACE(HWDEP), IFACE(HWDEP),
IFACE(MIXER), IFACE(MIXER),
@ -972,7 +972,7 @@ static const char *snd_ctl_elem_iface_names[] = {
IFACE(SEQUENCER), IFACE(SEQUENCER),
}; };
static const char *snd_ctl_event_type_names[] = { static const char *const snd_ctl_event_type_names[] = {
EVENT(ELEM), EVENT(ELEM),
}; };
#endif #endif

4
src/mixer/simple_none.c
View file

@ -89,7 +89,7 @@ typedef struct _selem_none {
} str[2]; } str[2];
} selem_none_t; } selem_none_t;
static struct mixer_name_table { static const struct mixer_name_table {
const char *longname; const char *longname;
const char *shortname; const char *shortname;
} name_table[] = { } name_table[] = {
@ -106,7 +106,7 @@ static struct mixer_name_table {
static const char *get_short_name(const char *lname) static const char *get_short_name(const char *lname)
{ {
struct mixer_name_table *p; const struct mixer_name_table *p;
for (p = name_table; p->longname; p++) { for (p = name_table; p->longname; p++) {
if (!strcmp(lname, p->longname)) if (!strcmp(lname, p->longname))
return p->shortname; return p->shortname;

32
src/pcm/pcm.c
View file

@ -1472,12 +1472,12 @@ int snd_pcm_poll_descriptors_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsign
#define SUBFORMATD(v, d) [SND_PCM_SUBFORMAT_##v] = d #define SUBFORMATD(v, d) [SND_PCM_SUBFORMAT_##v] = d
static const char *snd_pcm_stream_names[] = { static const char *const snd_pcm_stream_names[] = {
STREAM(PLAYBACK), STREAM(PLAYBACK),
STREAM(CAPTURE), STREAM(CAPTURE),
}; };
static const char *snd_pcm_state_names[] = { static const char *const snd_pcm_state_names[] = {
STATE(OPEN), STATE(OPEN),
STATE(SETUP), STATE(SETUP),
STATE(PREPARED), STATE(PREPARED),
@ -1489,7 +1489,7 @@ static const char *snd_pcm_state_names[] = {
STATE(DISCONNECTED), STATE(DISCONNECTED),
}; };
static const char *snd_pcm_access_names[] = { static const char *const snd_pcm_access_names[] = {
ACCESS(MMAP_INTERLEAVED), ACCESS(MMAP_INTERLEAVED),
ACCESS(MMAP_NONINTERLEAVED), ACCESS(MMAP_NONINTERLEAVED),
ACCESS(MMAP_COMPLEX), ACCESS(MMAP_COMPLEX),
@ -1497,7 +1497,7 @@ static const char *snd_pcm_access_names[] = {
ACCESS(RW_NONINTERLEAVED), ACCESS(RW_NONINTERLEAVED),
}; };
static const char *snd_pcm_format_names[] = { static const char *const snd_pcm_format_names[] = {
FORMAT(S8), FORMAT(S8),
FORMAT(U8), FORMAT(U8),
FORMAT(S16_LE), FORMAT(S16_LE),
@ -1538,7 +1538,7 @@ static const char *snd_pcm_format_names[] = {
FORMAT(U18_3BE), FORMAT(U18_3BE),
}; };
static const char *snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = { static const char *const snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = {
FORMAT(S16), FORMAT(S16),
FORMAT(U16), FORMAT(U16),
FORMAT(S24), FORMAT(S24),
@ -1550,7 +1550,7 @@ static const char *snd_pcm_format_aliases[SND_PCM_FORMAT_LAST+1] = {
FORMAT(IEC958_SUBFRAME), FORMAT(IEC958_SUBFRAME),
}; };
static const char *snd_pcm_format_descriptions[] = { static const char *const snd_pcm_format_descriptions[] = {
FORMATD(S8, "Signed 8 bit"), FORMATD(S8, "Signed 8 bit"),
FORMATD(U8, "Unsigned 8 bit"), FORMATD(U8, "Unsigned 8 bit"),
FORMATD(S16_LE, "Signed 16 bit Little Endian"), FORMATD(S16_LE, "Signed 16 bit Little Endian"),
@ -1591,7 +1591,7 @@ static const char *snd_pcm_format_descriptions[] = {
FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"), FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"),
}; };
static const char *snd_pcm_type_names[] = { static const char *const snd_pcm_type_names[] = {
PCMTYPE(HW), PCMTYPE(HW),
PCMTYPE(HOOKS), PCMTYPE(HOOKS),
PCMTYPE(MULTI), PCMTYPE(MULTI),
@ -1623,25 +1623,25 @@ static const char *snd_pcm_type_names[] = {
PCMTYPE(EXTPLUG), PCMTYPE(EXTPLUG),
}; };
static const char *snd_pcm_subformat_names[] = { static const char *const snd_pcm_subformat_names[] = {
SUBFORMAT(STD), SUBFORMAT(STD),
}; };
static const char *snd_pcm_subformat_descriptions[] = { static const char *const snd_pcm_subformat_descriptions[] = {
SUBFORMATD(STD, "Standard"), SUBFORMATD(STD, "Standard"),
}; };
static const char *snd_pcm_start_mode_names[] = { static const char *const snd_pcm_start_mode_names[] = {
START(EXPLICIT), START(EXPLICIT),
START(DATA), START(DATA),
}; };
static const char *snd_pcm_xrun_mode_names[] = { static const char *const snd_pcm_xrun_mode_names[] = {
XRUN(NONE), XRUN(NONE),
XRUN(STOP), XRUN(STOP),
}; };
static const char *snd_pcm_tstamp_mode_names[] = { static const char *const snd_pcm_tstamp_mode_names[] = {
TSTAMP(NONE), TSTAMP(NONE),
TSTAMP(ENABLE), TSTAMP(ENABLE),
}; };
@ -2035,7 +2035,7 @@ snd_pcm_t *snd_async_handler_get_pcm(snd_async_handler_t *handler)
return handler->u.pcm; return handler->u.pcm;
} }
static char *build_in_pcms[] = { static const char *const build_in_pcms[] = {
"adpcm", "alaw", "copy", "dmix", "file", "hooks", "hw", "ladspa", "lfloat", "adpcm", "alaw", "copy", "dmix", "file", "hooks", "hw", "ladspa", "lfloat",
"linear", "meter", "mulaw", "multi", "null", "empty", "plug", "rate", "route", "share", "linear", "meter", "mulaw", "multi", "null", "empty", "plug", "rate", "route", "share",
"shm", "dsnoop", "dshare", "asym", "iec958", "softvol", "mmap_emul", "shm", "dsnoop", "dshare", "asym", "iec958", "softvol", "mmap_emul",
@ -2129,7 +2129,7 @@ static int snd_pcm_open_conf(snd_pcm_t **pcmp, const char *name,
sprintf(buf, "_snd_pcm_%s_open", str); sprintf(buf, "_snd_pcm_%s_open", str);
} }
if (!lib) { if (!lib) {
char **build_in = build_in_pcms; const char *const *build_in = build_in_pcms;
while (*build_in) { while (*build_in) {
if (!strcmp(*build_in, str)) if (!strcmp(*build_in, str))
break; break;
@ -6690,7 +6690,7 @@ link_warning(_snd_pcm_mmap_hw_ptr, "Warning: _snd_pcm_mmap_hw_ptr() is deprecate
link_warning(_snd_pcm_boundary, "Warning: _snd_pcm_boundary() is deprecated, consider to use snd_pcm_sw_params_current()"); link_warning(_snd_pcm_boundary, "Warning: _snd_pcm_boundary() is deprecated, consider to use snd_pcm_sw_params_current()");
#endif #endif
static const char *names[SND_PCM_HW_PARAM_LAST_INTERVAL + 1] = { static const char *const names[SND_PCM_HW_PARAM_LAST_INTERVAL + 1] = {
[SND_PCM_HW_PARAM_FORMAT] = "format", [SND_PCM_HW_PARAM_FORMAT] = "format",
[SND_PCM_HW_PARAM_CHANNELS] = "channels", [SND_PCM_HW_PARAM_CHANNELS] = "channels",
[SND_PCM_HW_PARAM_RATE] = "rate", [SND_PCM_HW_PARAM_RATE] = "rate",
@ -6836,7 +6836,7 @@ int snd_pcm_slave_conf(snd_config_t *root, snd_config_t *conf,
int snd_pcm_conf_generic_id(const char *id) int snd_pcm_conf_generic_id(const char *id)
{ {
static const char *ids[] = { "comment", "type", "hint" }; static const char ids[3][8] = { "comment", "type", "hint" };
unsigned int k; unsigned int k;
for (k = 0; k < sizeof(ids) / sizeof(ids[0]); ++k) { for (k = 0; k < sizeof(ids) / sizeof(ids[0]); ++k) {
if (strcmp(id, ids[k]) == 0) if (strcmp(id, ids[k]) == 0)

4
src/pcm/pcm_rate.c
View file

@ -1256,7 +1256,7 @@ static int is_builtin_plugin(const char *type)
return strcmp(type, "linear") == 0; return strcmp(type, "linear") == 0;
} }
static const char *default_rate_plugins[] = { static const char *const default_rate_plugins[] = {
"speexrate", "linear", NULL "speexrate", "linear", NULL
}; };
@ -1340,7 +1340,7 @@ int snd_pcm_rate_open(snd_pcm_t **pcmp, const char *name,
#ifdef PIC #ifdef PIC
err = -ENOENT; err = -ENOENT;
if (!converter) { if (!converter) {
const char **types; const char *const *types;
for (types = default_rate_plugins; *types; types++) { for (types = default_rate_plugins; *types; types++) {
err = rate_open_func(rate, *types); err = rate_open_func(rate, *types);
if (!err) { if (!err) {