From 9eb272c753e2d376be87433b2428f69c24a4bccb Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 25 Oct 2007 15:34:43 +0200 Subject: [PATCH] Fix gcc compile warnings Fix gcc compile warnings with nasty const cast. Let's use simply macros instead of inline functions. It's just an array access after all... --- src/pcm/pcm_params.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) diff --git a/src/pcm/pcm_params.c b/src/pcm/pcm_params.c index 60722403..63785010 100644 --- a/src/pcm/pcm_params.c +++ b/src/pcm/pcm_params.c @@ -78,31 +78,14 @@ static inline int hw_is_interval(snd_pcm_hw_param_t var) var <= SND_PCM_HW_PARAM_LAST_INTERVAL; } -static inline snd_mask_t *hw_param_mask(snd_pcm_hw_params_t *params, - snd_pcm_hw_param_t var) -{ - assert(hw_is_mask(var)); - return (snd_mask_t*)¶ms->masks[var - SND_PCM_HW_PARAM_FIRST_MASK]; -} +#define hw_param_mask(params,var) \ + &((params)->masks[(var) - SND_PCM_HW_PARAM_FIRST_MASK]) -static inline snd_interval_t *hw_param_interval(snd_pcm_hw_params_t *params, - snd_pcm_hw_param_t var) -{ - assert(hw_is_interval(var)); - return ¶ms->intervals[var - SND_PCM_HW_PARAM_FIRST_INTERVAL]; -} +#define hw_param_interval(params,var) \ + &((params)->intervals[(var) - SND_PCM_HW_PARAM_FIRST_INTERVAL]) -static inline const snd_mask_t *hw_param_mask_c(const snd_pcm_hw_params_t *params, - snd_pcm_hw_param_t var) -{ - return (const snd_mask_t *)hw_param_mask((snd_pcm_hw_params_t*) params, var); -} - -static inline const snd_interval_t *hw_param_interval_c(const snd_pcm_hw_params_t *params, - snd_pcm_hw_param_t var) -{ - return (const snd_interval_t *)hw_param_interval((snd_pcm_hw_params_t*) params, var); -} +#define hw_param_mask_c hw_param_mask +#define hw_param_interval_c hw_param_interval static void _snd_pcm_hw_param_any(snd_pcm_hw_params_t *params, snd_pcm_hw_param_t var) { -- 2.47.1