]> git.alsa-project.org Git - alsa-lib.git/commitdiff
fixed compile warnings.
authorTakashi Iwai <tiwai@suse.de>
Thu, 15 Apr 2004 12:52:49 +0000 (12:52 +0000)
committerTakashi Iwai <tiwai@suse.de>
Thu, 15 Apr 2004 12:52:49 +0000 (12:52 +0000)
src/mixer/simple.c
src/pcm/pcm.c
src/pcm/pcm_local.h
src/pcm/pcm_misc.c

index ad9190d27f011cbef9151380d5caa52a0bad56ad..42620b496eabe78be36237367540de6161ee7f9b 100644 (file)
@@ -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));
index 1de19212daffa6c18ef84684e1b2c2b81f488f82..942469779f0d8fa6edcfd2510ea0449cbcd56396 100644 (file)
@@ -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;
        }
index 5693c82f0624d225073abbe6be024fe31b4d6bce..d8c98584c1d1563641b569fe9807118902ad1c55 100644 (file)
@@ -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;
index dddeff41877bbc63657ad1f8e872cc557b69163c..c641e353ba23fc8e6b43bd655b7c757f341802ff 100644 (file)
@@ -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;
        }