From 6fc5e5dd2ae5c1ec5fc6cce490402b333f075f57 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 21 Sep 2004 10:35:57 +0000 Subject: [PATCH] Fix warnings with -Wshadow Fixed compile warnings when compiled with -Wshadow. (Renamed the shadow parameteres with _ prefix to avoid confliction.) --- include/hwdep.h | 2 +- include/pcm.h | 14 +++++++------- include/seq.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/hwdep.h b/include/hwdep.h index 929eaa4b..2b939a6b 100644 --- a/include/hwdep.h +++ b/include/hwdep.h @@ -139,7 +139,7 @@ const char *snd_hwdep_dsp_image_get_name(const snd_hwdep_dsp_image_t *obj); const void *snd_hwdep_dsp_image_get_image(const snd_hwdep_dsp_image_t *obj); size_t snd_hwdep_dsp_image_get_length(const snd_hwdep_dsp_image_t *obj); -void snd_hwdep_dsp_image_set_index(snd_hwdep_dsp_image_t *obj, unsigned int index); +void snd_hwdep_dsp_image_set_index(snd_hwdep_dsp_image_t *obj, unsigned int _index); void snd_hwdep_dsp_image_set_name(snd_hwdep_dsp_image_t *obj, const char *name); void snd_hwdep_dsp_image_set_image(snd_hwdep_dsp_image_t *obj, void *buffer); void snd_hwdep_dsp_image_set_length(snd_hwdep_dsp_image_t *obj, size_t length); diff --git a/include/pcm.h b/include/pcm.h index 9ddfe0b2..22bcc990 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -532,11 +532,11 @@ void snd_pcm_hw_params_copy(snd_pcm_hw_params_t *dst, const snd_pcm_hw_params_t #ifndef ALSA_PCM_OLD_HW_PARAMS_API -int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params, snd_pcm_access_t *access); -int snd_pcm_hw_params_test_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t access); -int snd_pcm_hw_params_set_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t access); -int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access); -int snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *access); +int snd_pcm_hw_params_get_access(const snd_pcm_hw_params_t *params, snd_pcm_access_t *_access); +int snd_pcm_hw_params_test_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access); +int snd_pcm_hw_params_set_access(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t _access); +int snd_pcm_hw_params_set_access_first(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *_access); +int snd_pcm_hw_params_set_access_last(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_t *_access); int snd_pcm_hw_params_set_access_mask(snd_pcm_t *pcm, snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); int snd_pcm_hw_params_get_access_mask(snd_pcm_hw_params_t *params, snd_pcm_access_mask_t *mask); @@ -1257,7 +1257,7 @@ int snd_spcm_init(snd_pcm_t *pcm, snd_pcm_format_t format, snd_pcm_subformat_t subformat, snd_spcm_latency_t latency, - snd_pcm_access_t access, + snd_pcm_access_t _access, snd_spcm_xrun_type_t xrun_type); int snd_spcm_init_duplex(snd_pcm_t *playback_pcm, @@ -1267,7 +1267,7 @@ int snd_spcm_init_duplex(snd_pcm_t *playback_pcm, snd_pcm_format_t format, snd_pcm_subformat_t subformat, snd_spcm_latency_t latency, - snd_pcm_access_t access, + snd_pcm_access_t _access, snd_spcm_xrun_type_t xrun_type, snd_spcm_duplex_type_t duplex_type); diff --git a/include/seq.h b/include/seq.h index f46aa867..31acb1b2 100644 --- a/include/seq.h +++ b/include/seq.h @@ -360,7 +360,7 @@ void snd_seq_query_subscribe_set_client(snd_seq_query_subscribe_t *info, int cli void snd_seq_query_subscribe_set_port(snd_seq_query_subscribe_t *info, int port); void snd_seq_query_subscribe_set_root(snd_seq_query_subscribe_t *info, const snd_seq_addr_t *addr); void snd_seq_query_subscribe_set_type(snd_seq_query_subscribe_t *info, snd_seq_query_subs_type_t type); -void snd_seq_query_subscribe_set_index(snd_seq_query_subscribe_t *info, int index); +void snd_seq_query_subscribe_set_index(snd_seq_query_subscribe_t *info, int _index); int snd_seq_query_port_subscribers(snd_seq_t *seq, snd_seq_query_subscribe_t * subs); -- 2.47.1