diff options
| author | Abramo Bagnara <abramo@alsa-project.org> | 2001-03-29 17:50:28 +0000 |
|---|---|---|
| committer | Abramo Bagnara <abramo@alsa-project.org> | 2001-03-29 17:50:28 +0000 |
| commit | 5b50ec848a65396d5e8be32290c4431485001ed5 (patch) | |
| tree | 643d105bdf11f7b74b0d9c15eeaf84b975b0d1f6 /src/mixer/mixer.c | |
| parent | ce8275b943001a1dd8e3264f0cad11ca9e3cf2bb (diff) | |
Lot of cleanings with the help of gcc3
Diffstat (limited to 'src/mixer/mixer.c')
| -rw-r--r-- | src/mixer/mixer.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/mixer/mixer.c b/src/mixer/mixer.c index a40f45ea..471911e4 100644 --- a/src/mixer/mixer.c +++ b/src/mixer/mixer.c @@ -186,7 +186,7 @@ int snd_mixer_detach(snd_mixer_t *mixer, const char *name) return -ENOENT; } -int snd_mixer_throw_event(snd_mixer_t *mixer, unsigned int mask, +static int snd_mixer_throw_event(snd_mixer_t *mixer, unsigned int mask, snd_mixer_elem_t *elem) { mixer->events++; @@ -411,8 +411,8 @@ static int snd_mixer_sort(snd_mixer_t *mixer) { unsigned int k; int compar(const void *a, const void *b) { - return mixer->compare(*(const snd_mixer_elem_t **) a, - *(const snd_mixer_elem_t **) b); + return mixer->compare(*(const snd_mixer_elem_t * const *) a, + *(const snd_mixer_elem_t * const *) b); } assert(mixer); assert(mixer->compare); @@ -490,10 +490,11 @@ int snd_mixer_wait(snd_mixer_t *mixer, int timeout) pfds = malloc(count * sizeof(*pfds)); if (!pfds) return -ENOMEM; - err = snd_mixer_poll_descriptors(mixer, pfds, count); + err = snd_mixer_poll_descriptors(mixer, pfds, + (unsigned int) count); assert(err == count); } - err = poll(pfds, count, timeout); + err = poll(pfds, (unsigned int) count, timeout); if (err < 0) return -errno; return 0; |