mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Mark static tables as constant when possible.

Browse source 
This makes it possible to write them to .data.rel.ro or to .rodata if
there is no relocation involved (arrays of character arrays).

Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>
This commit is contained in:
Diego E. 'Flameeyes' Pettenò 2008-11-21 22:19:28 +01:00
parent fc8d8bb2e6
commit 03388ca6d3
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/alisp/alisp.c
View file

@ -2965,7 +2965,7 @@ struct intrinsic {
struct alisp_object * (*func)(struct alisp_instance *instance, struct alisp_object * args);
};
static struct intrinsic intrinsics[] = {
static const struct intrinsic intrinsics[] = {
{ "!=", F_numneq },
{ "%", F_mod },
{ "&check-memory", F_check_memory },

6
src/alisp/alisp_snd.c
View file

@ -286,7 +286,7 @@ static struct alisp_object * FA_int_pp_strp_int(struct alisp_instance * instance
int err, mode;
void *handle;
struct alisp_object *p1, *p2;
static struct flags flags[] = {
static const struct flags flags[] = {
{ "nonblock", SND_CTL_NONBLOCK },
{ "async", SND_CTL_ASYNC },
{ "readonly", SND_CTL_READONLY },
@ -789,7 +789,7 @@ static struct alisp_object * FA_pcm_info(struct alisp_instance * instance, struc
* main code
*/
static struct acall_table acall_table[] = {
static const struct acall_table acall_table[] = {
{ "card_get_index", &FA_int_str, (void *)snd_card_get_index, NULL },
{ "card_get_longname", &FA_int_int_strp, (void *)snd_card_get_longname, NULL },
{ "card_get_name", &FA_int_int_strp, (void *)snd_card_get_name, NULL },
@ -933,7 +933,7 @@ static struct alisp_object * F_syserr(struct alisp_instance *instance, struct al
return &alsa_lisp_t;
}
static struct intrinsic snd_intrinsics[] = {
static const struct intrinsic snd_intrinsics[] = {
{ "Acall", F_acall },
{ "Aerror", F_aerror },
{ "Ahandle", F_ahandle },

4
src/confmisc.c
View file

@ -88,8 +88,8 @@
int snd_config_get_bool_ascii(const char *ascii)
{
unsigned int k;
static struct {
const char *str;
static const struct {
const char str[8];
int val;
} b[] = {
{ "0", 0 },

6
src/control/hcontrol.c
View file

@ -234,7 +234,7 @@ static int snd_hctl_compare_mixer_priority_lookup(const char **name, const char
static int get_compare_weight(const snd_ctl_elem_id_t *id)
{
static const char *names[] = {
static const char *const names[] = {
"Master",
"Hardware Master",
"Headphone",
@ -270,7 +270,7 @@ static int get_compare_weight(const snd_ctl_elem_id_t *id)
"IEC958",
NULL
};
static const char *names1[] = {
static const char *const names1[] = {
"Switch",
"Volume",
"Playback",
@ -284,7 +284,7 @@ static int get_compare_weight(const snd_ctl_elem_id_t *id)
"-",
NULL
};
static const char *names2[] = {
static const char *const names2[] = {
"Switch",
"Volume",
"Bypass",

2
src/control/namehint.c
View file

@ -392,7 +392,7 @@ static int try_config(struct hint_list *list,
typedef int (*next_devices_t)(snd_ctl_t *, int *);
static next_devices_t next_devices[] = {
static const next_devices_t next_devices[] = {
IFACE(CARD, NULL),
IFACE(HWDEP, snd_ctl_hwdep_next_device),
IFACE(MIXER, NULL),

2
src/mixer/simple.c
View file

@ -217,7 +217,7 @@ int snd_mixer_selem_has_common_switch(snd_mixer_elem_t *elem)
*/
const char *snd_mixer_selem_channel_name(snd_mixer_selem_channel_id_t channel)
{
static const char *array[SND_MIXER_SCHN_LAST + 1] = {
static const char *const array[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",

10
src/mixer/simple_none.c
View file

@ -131,7 +131,7 @@ static int compare_mixer_priority_lookup(const char **name, const char * const *
static int get_compare_weight(const char *name, unsigned int idx)
{
static const char *names[] = {
static const char *const names[] = {
"Master",
"Headphone",
"Tone",
@ -165,11 +165,11 @@ static int get_compare_weight(const char *name, unsigned int idx)
"Mix",
NULL
};
static const char *names1[] = {
static const char *const names1[] = {
"-",
NULL,
};
static const char *names2[] = {
static const char *const names2[] = {
"Mono",
"Digital",
"Switch",
@ -883,7 +883,7 @@ static int simple_update(snd_mixer_elem_t *melem)
}
#ifndef DOC_HIDDEN
static struct suf {
static const struct suf {
const char *suffix;
selem_ctl_type_t type;
} suffixes[] = {
@ -906,7 +906,7 @@ static struct suf {
/* Return base length or 0 on failure */
static int base_len(const char *name, selem_ctl_type_t *type)
{
struct suf *p;
const struct suf *p;
size_t nlen = strlen(name);
p = suffixes;
while (p->suffix) {

6
src/pcm/pcm_route.c
View file

@ -236,14 +236,14 @@ static void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area,
#include "plugin_ops.h"
#undef GETS_LABELS
#undef PUT32_LABELS
static void *zero_labels[3] = {
static void *const zero_labels[3] = {
&&zero_int32, &&zero_int64,
#if SND_PCM_PLUGIN_ROUTE_FLOAT
&&zero_float
#endif
};
/* sum_type att */
static void *add_labels[3 * 2] = {
static void *const add_labels[3 * 2] = {
&&add_int32_noatt, &&add_int32_att,
&&add_int64_noatt, &&add_int64_att,
#if SND_PCM_PLUGIN_ROUTE_FLOAT
@ -251,7 +251,7 @@ static void snd_pcm_route_convert1_many(const snd_pcm_channel_area_t *dst_area,
#endif
};
/* sum_type att shift */
static void *norm_labels[3 * 2 * 4] = {
static void *const norm_labels[3 * 2 * 4] = {
0,
&&norm_int32_8_noatt,
&&norm_int32_16_noatt,

2
src/rawmidi/rawmidi.c
View file

@ -989,7 +989,7 @@ ssize_t snd_rawmidi_read(snd_rawmidi_t *rawmidi, void *buffer, size_t size)
int snd_rawmidi_conf_generic_id(const char *id)
{
static const char *ids[] = {
static const char ids[][8] = {
"comment",
"type",
"hint",