From 965222c3d9ab63dc3f20771abe37140b86ce9f34 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 15 Apr 2004 12:52:49 +0000 Subject: [PATCH] fixed compile warnings. --- src/mixer/simple.c | 2 +- src/pcm/pcm.c | 3 ++- src/pcm/pcm_local.h | 2 ++ src/pcm/pcm_misc.c | 22 +++++++++++++--------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/mixer/simple.c b/src/mixer/simple.c index ad9190d2..42620b49 100644 --- a/src/mixer/simple.c +++ b/src/mixer/simple.c @@ -1105,7 +1105,7 @@ static int simple_compare(const snd_mixer_elem_t *c1, const snd_mixer_elem_t *c2 * \return 0 on success otherwise a negative error code */ int snd_mixer_selem_register(snd_mixer_t *mixer, struct - snd_mixer_selem_regopt *options, + snd_mixer_selem_regopt *options ATTRIBUTE_UNUSED, snd_mixer_class_t **classp) { snd_mixer_class_t *class = calloc(1, sizeof(*class)); diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 1de19212..94246977 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -2168,9 +2168,10 @@ int snd_pcm_area_silence(const snd_pcm_channel_area_t *dst_area, snd_pcm_uframes silence = snd_pcm_format_silence_64(format); if (dst_area->step == (unsigned int) width) { unsigned int dwords = samples * width / 64; + u_int64_t *dstp = (u_int64_t *)dst; samples -= dwords * 64 / width; while (dwords-- > 0) - *((u_int64_t*)dst)++ = silence; + *dstp++ = silence; if (samples == 0) return 0; } diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index 5693c82f..d8c98584 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -276,6 +276,8 @@ static inline int snd_pcm_check_error(snd_pcm_t *pcm, int err) return -ESTRPIPE; case SND_PCM_STATE_DISCONNECTED: return -ENOTTY; + default: + break; } } return err; diff --git a/src/pcm/pcm_misc.c b/src/pcm/pcm_misc.c index dddeff41..c641e353 100644 --- a/src/pcm/pcm_misc.c +++ b/src/pcm/pcm_misc.c @@ -564,28 +564,30 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int } case 16: { u_int16_t silence = snd_pcm_format_silence_64(format); + u_int16_t *pdata = (u_int16_t *)data; if (! silence) memset(data, 0, samples * 2); else { while (samples-- > 0) - *((u_int16_t *)data)++ = silence; + *pdata++ = silence; } break; } case 24: { u_int32_t silence = snd_pcm_format_silence_64(format); + u_int8_t *pdata = (u_int8_t *)data; if (! silence) memset(data, 0, samples * 3); else { while (samples-- > 0) { #ifdef SNDRV_LITTLE_ENDIAN - *((u_int8_t *)data)++ = silence >> 0; - *((u_int8_t *)data)++ = silence >> 8; - *((u_int8_t *)data)++ = silence >> 16; + *pdata++ = silence >> 0; + *pdata++ = silence >> 8; + *pdata++ = silence >> 16; #else - *((u_int8_t *)data)++ = silence >> 16; - *((u_int8_t *)data)++ = silence >> 8; - *((u_int8_t *)data)++ = silence >> 0; + *pdata++ = silence >> 16; + *pdata++ = silence >> 8; + *pdata++ = silence >> 0; #endif } } @@ -593,21 +595,23 @@ int snd_pcm_format_set_silence(snd_pcm_format_t format, void *data, unsigned int } case 32: { u_int32_t silence = snd_pcm_format_silence_64(format); + u_int32_t *pdata = (u_int32_t *)data; if (! silence) memset(data, 0, samples * 4); else { while (samples-- > 0) - *((u_int32_t *)data)++ = silence; + *pdata++ = silence; } break; } case 64: { u_int64_t silence = snd_pcm_format_silence_64(format); + u_int64_t *pdata = (u_int64_t *)data; if (! silence) memset(data, 0, samples * 8); else { while (samples-- > 0) - *((u_int64_t *)data)++ = silence; + *pdata++ = silence; } break; } -- 2.47.1