Constify arrays

7 files changed, 29 insertions, 29 deletions

diff --git a/src/control.c b/src/control.c
index 95aae82..d7c4ed4 100644
--- a/src/control.c
+++ b/src/control.c
@@ -299,7 +299,7 @@ int snd_ctl_wait(snd_ctl_t *ctl, int timeout)
 #define IFACE1(v, n) [SND_CTL_ELEM_IFACE_##v] = #n
 #define EVENT(v) [SND_CTL_EVENT_##v] = #v
 
-const char *_snd_ctl_elem_type_names[] = {
+const char * const _snd_ctl_elem_type_names[] = {
 	TYPE(NONE),
 	TYPE(BOOLEAN),
 	TYPE(INTEGER),
@@ -309,7 +309,7 @@ const char *_snd_ctl_elem_type_names[] = {
 	TYPE(INTEGER64),
 };
 
-const char *_snd_ctl_elem_iface_names[] = {
+const char * const _snd_ctl_elem_iface_names[] = {
 	IFACE(CARD),
 	IFACE(HWDEP),
 	IFACE(MIXER),
@@ -319,7 +319,7 @@ const char *_snd_ctl_elem_iface_names[] = {
 	IFACE(SEQUENCER),
 };
 
-const char *_snd_ctl_event_type_names[] = {
+const char * const _snd_ctl_event_type_names[] = {
 	EVENT(ELEM),
 };
 
diff --git a/src/ctl_macros.h b/src/ctl_macros.h
index 04af071..239ecec 100644
--- a/src/ctl_macros.h
+++ b/src/ctl_macros.h
@@ -222,9 +222,9 @@ int snd_ctl_read(snd_ctl_t *ctl, snd_ctl_event_t *event)
 }
 
 
-extern const char *_snd_ctl_elem_type_names[];
-extern const char *_snd_ctl_elem_iface_names[];
-extern const char *_snd_ctl_event_type_names[];
+extern const char * const _snd_ctl_elem_type_names[];
+extern const char * const _snd_ctl_elem_iface_names[];
+extern const char * const _snd_ctl_event_type_names[];
 
 #define snd_ctl_elem_type_name(type)	_snd_ctl_elem_type_names[type]
 #define snd_ctl_elem_iface_name(iface)	_snd_ctl_elem_iface_names[iface]
diff --git a/src/mixer.c b/src/mixer.c
index d088cc8..4c12476 100644
--- a/src/mixer.c
+++ b/src/mixer.c
@@ -759,7 +759,7 @@ snd_mixer_elem_t *snd_mixer_find_selem(snd_mixer_t *mixer,
 	return NULL;
 }
 
-const char *_snd_mixer_selem_channels[SND_MIXER_SCHN_LAST + 1] = {
+const char * const _snd_mixer_selem_channels[SND_MIXER_SCHN_LAST + 1] = {
 	[SND_MIXER_SCHN_FRONT_LEFT] = "Front Left",
 	[SND_MIXER_SCHN_FRONT_RIGHT] = "Front Right",
 	[SND_MIXER_SCHN_REAR_LEFT] = "Rear Left",
diff --git a/src/mixer_macros.h b/src/mixer_macros.h
index 4b41ab1..c1372bf 100644
--- a/src/mixer_macros.h
+++ b/src/mixer_macros.h
@@ -259,7 +259,7 @@ int snd_mixer_selem_has_common_switch(snd_mixer_elem_t *elem)
 	return !!(elem->caps & SND_SM_CAP_GSWITCH);
 }
 
-extern const char *_snd_mixer_selem_channels[];
+extern const char * const _snd_mixer_selem_channels[];
 
 __SALSA_EXPORT_FUNC
 const char *snd_mixer_selem_channel_name(snd_mixer_selem_channel_id_t channel)
diff --git a/src/pcm.c b/src/pcm.c
index acdf935..8ea3625 100644
--- a/src/pcm.c
+++ b/src/pcm.c
@@ -280,12 +280,12 @@ snd_pcm_sframes_t snd_pcm_readn(snd_pcm_t *pcm, void **bufs,
 #define SUBFORMATD(v, d) [SND_PCM_SUBFORMAT_##v] = d 
 
 
-const char *_snd_pcm_stream_names[] = {
+const char * const _snd_pcm_stream_names[SND_PCM_STREAM_LAST + 1] = {
 	STREAM(PLAYBACK),
 	STREAM(CAPTURE),
 };
 
-const char *_snd_pcm_state_names[] = {
+const char * const _snd_pcm_state_names[SND_PCM_STATE_LAST + 1] = {
 	STATE(OPEN),
 	STATE(SETUP),
 	STATE(PREPARED),
@@ -297,7 +297,7 @@ const char *_snd_pcm_state_names[] = {
 	STATE(DISCONNECTED),
 };
 
-const char *_snd_pcm_access_names[SND_MASK_MAX + 1] = {
+const char * const _snd_pcm_access_names[SND_PCM_ACCESS_LAST + 1] = {
 	ACCESS(MMAP_INTERLEAVED), 
 	ACCESS(MMAP_NONINTERLEAVED),
 	ACCESS(MMAP_COMPLEX),
@@ -305,7 +305,7 @@ const char *_snd_pcm_access_names[SND_MASK_MAX + 1] = {
 	ACCESS(RW_NONINTERLEAVED),
 };
 
-const char *_snd_pcm_format_names[SND_MASK_MAX + 1] = {
+const char * const _snd_pcm_format_names[SND_PCM_FORMAT_LAST + 1] = {
 	FORMAT(S8),
 	FORMAT(U8),
 	FORMAT(S16_LE),
@@ -346,7 +346,7 @@ const char *_snd_pcm_format_names[SND_MASK_MAX + 1] = {
 	FORMAT(U18_3BE),
 };
 
-static const char *_snd_pcm_format_aliases[SND_MASK_MAX + 1] = {
+static const char * const _snd_pcm_format_aliases[SND_PCM_FORMAT_LAST + 1] = {
 	FORMAT(S16),
 	FORMAT(U16),
 	FORMAT(S24),
@@ -358,7 +358,7 @@ static const char *_snd_pcm_format_aliases[SND_MASK_MAX + 1] = {
 	FORMAT(IEC958_SUBFRAME),
 };
 
-const char *_snd_pcm_format_descriptions[SND_MASK_MAX + 1] = {
+const char * const _snd_pcm_format_descriptions[SND_PCM_FORMAT_LAST + 1] = {
 	FORMATD(S8, "Signed 8 bit"), 
 	FORMATD(U8, "Unsigned 8 bit"),
 	FORMATD(S16_LE, "Signed 16 bit Little Endian"),
@@ -399,7 +399,7 @@ const char *_snd_pcm_format_descriptions[SND_MASK_MAX + 1] = {
 	FORMATD(U18_3BE, "Unsigned 18 bit Big Endian in 3bytes"),
 };
 
-const char *_snd_pcm_type_names[] = {
+const char * const _snd_pcm_type_names[] = {
 	PCMTYPE(HW), 
 	PCMTYPE(HOOKS), 
 	PCMTYPE(MULTI), 
@@ -431,15 +431,15 @@ const char *_snd_pcm_type_names[] = {
         PCMTYPE(EXTPLUG),
 };
 
-const char *_snd_pcm_subformat_names[SND_MASK_MAX + 1] = {
+const char * const _snd_pcm_subformat_names[SND_PCM_SUBFORMAT_LAST + 1] = {
 	SUBFORMAT(STD), 
 };
 
-const char *_snd_pcm_subformat_descriptions[SND_MASK_MAX + 1] = {
+const char * const _snd_pcm_subformat_descriptions[SND_PCM_SUBFORMAT_LAST + 1] = {
 	SUBFORMATD(STD, "Standard"), 
 };
 
-const char *_snd_pcm_tstamp_mode_names[] = {
+const char * const _snd_pcm_tstamp_mode_names[SND_PCM_TSTAMP_LAST + 1] = {
 	TSTAMP(NONE),
 	TSTAMP(MMAP),
 };
diff --git a/src/pcm_macros.h b/src/pcm_macros.h
index 1c82701..cef010c 100644
--- a/src/pcm_macros.h
+++ b/src/pcm_macros.h
@@ -20,7 +20,7 @@ typedef struct {
 } snd_pcm_channel_info_t;
 
 struct _snd_pcm {
-	char *name;
+	const char *name;
 	snd_pcm_type_t type;
 	snd_pcm_stream_t stream;
 	int mode;
@@ -297,15 +297,15 @@ int snd_pcm_unlink(snd_pcm_t *pcm)
 }
 
 
-extern const char *_snd_pcm_stream_names[];
-extern const char *_snd_pcm_state_names[];
-extern const char *_snd_pcm_access_names[];
-extern const char *_snd_pcm_format_names[];
-extern const char *_snd_pcm_format_descriptions[];
-extern const char *_snd_pcm_type_names[];
-extern const char *_snd_pcm_subformat_names[] ;
-extern const char *_snd_pcm_subformat_descriptions[];
-extern const char *_snd_pcm_tstamp_mode_names[];
+extern const char * const _snd_pcm_stream_names[];
+extern const char * const _snd_pcm_state_names[];
+extern const char * const _snd_pcm_access_names[];
+extern const char * const _snd_pcm_format_names[];
+extern const char * const _snd_pcm_format_descriptions[];
+extern const char * const _snd_pcm_type_names[];
+extern const char * const _snd_pcm_subformat_names[] ;
+extern const char * const _snd_pcm_subformat_descriptions[];
+extern const char * const _snd_pcm_tstamp_mode_names[];
 
 __SALSA_EXPORT_FUNC
 const char *snd_pcm_stream_name(snd_pcm_stream_t stream)
diff --git a/src/pcm_params.c b/src/pcm_params.c
index f8e8e4f..8d43886 100644
--- a/src/pcm_params.c
+++ b/src/pcm_params.c
@@ -1131,7 +1131,7 @@ void snd_pcm_hw_param_dump(const snd_pcm_hw_params_t *params,
 
 #define HW_PARAM(v) [SNDRV_PCM_HW_PARAM_##v] = #v
 
-static const char *snd_pcm_hw_param_names[] = {
+static const char * const snd_pcm_hw_param_names[] = {
 	HW_PARAM(ACCESS),
 	HW_PARAM(FORMAT),
 	HW_PARAM(SUBFORMAT),