diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-09-08 08:29:58 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-09-08 08:45:06 -0400 |
commit | 4f7454a9970fa0f3e9f1a68201520e3df1bb5224 (patch) | |
tree | 2bd07fd5fe7dc518b25b3b61592cad4a3fbf10b9 /sound/core | |
parent | 6e5265ec34d3b9578973841ddec8b925e986136a (diff) |
ALSA: Add const prefix to proc helper functions
Add appropriate const prefix to char * arguments in proc helper functions.
Also fixed the caller side to be proper const pointers.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core')
-rw-r--r-- | sound/core/info.c | 4 | ||||
-rw-r--r-- | sound/core/oss/mixer_oss.c | 3 | ||||
-rw-r--r-- | sound/core/oss/pcm_oss.c | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/sound/core/info.c b/sound/core/info.c index 35df614f6c55..6eb53930ea1d 100644 --- a/sound/core/info.c +++ b/sound/core/info.c | |||
@@ -108,7 +108,7 @@ static int resize_info_buffer(struct snd_info_buffer *buffer, | |||
108 | * | 108 | * |
109 | * Returns the size of output string. | 109 | * Returns the size of output string. |
110 | */ | 110 | */ |
111 | int snd_iprintf(struct snd_info_buffer *buffer, char *fmt,...) | 111 | int snd_iprintf(struct snd_info_buffer *buffer, const char *fmt, ...) |
112 | { | 112 | { |
113 | va_list args; | 113 | va_list args; |
114 | int len, res; | 114 | int len, res; |
@@ -727,7 +727,7 @@ EXPORT_SYMBOL(snd_info_get_line); | |||
727 | * Returns the updated pointer of the original string so that | 727 | * Returns the updated pointer of the original string so that |
728 | * it can be used for the next call. | 728 | * it can be used for the next call. |
729 | */ | 729 | */ |
730 | char *snd_info_get_str(char *dest, char *src, int len) | 730 | const char *snd_info_get_str(char *dest, const char *src, int len) |
731 | { | 731 | { |
732 | int c; | 732 | int c; |
733 | 733 | ||
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index 5dcd8a526970..772423889eb3 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c | |||
@@ -1154,7 +1154,8 @@ static void snd_mixer_oss_proc_write(struct snd_info_entry *entry, | |||
1154 | struct snd_info_buffer *buffer) | 1154 | struct snd_info_buffer *buffer) |
1155 | { | 1155 | { |
1156 | struct snd_mixer_oss *mixer = entry->private_data; | 1156 | struct snd_mixer_oss *mixer = entry->private_data; |
1157 | char line[128], str[32], idxstr[16], *cptr; | 1157 | char line[128], str[32], idxstr[16]; |
1158 | const char *cptr; | ||
1158 | int ch, idx; | 1159 | int ch, idx; |
1159 | struct snd_mixer_oss_assign_table *tbl; | 1160 | struct snd_mixer_oss_assign_table *tbl; |
1160 | struct slot *slot; | 1161 | struct slot *slot; |
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index dbe406b82591..d8b2d76125b4 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
@@ -2836,7 +2836,8 @@ static void snd_pcm_oss_proc_write(struct snd_info_entry *entry, | |||
2836 | struct snd_info_buffer *buffer) | 2836 | struct snd_info_buffer *buffer) |
2837 | { | 2837 | { |
2838 | struct snd_pcm_str *pstr = entry->private_data; | 2838 | struct snd_pcm_str *pstr = entry->private_data; |
2839 | char line[128], str[32], task_name[32], *ptr; | 2839 | char line[128], str[32], task_name[32]; |
2840 | const char *ptr; | ||
2840 | int idx1; | 2841 | int idx1; |
2841 | struct snd_pcm_oss_setup *setup, *setup1, template; | 2842 | struct snd_pcm_oss_setup *setup, *setup1, template; |
2842 | 2843 | ||