From: Jaroslav Kysela Date: Fri, 6 Oct 2006 11:18:34 +0000 (+0200) Subject: fix various warnings X-Git-Tag: v1.0.14rc1~26 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=57eb3145b8b90791ccbb743bc6cca8259c38e2b1;p=alsa-lib.git fix various warnings See also ALSA bug#1689 --- diff --git a/include/global.h b/include/global.h index 7b8c176a..4889eae5 100644 --- a/include/global.h +++ b/include/global.h @@ -130,7 +130,7 @@ int snd_shm_area_destroy(struct snd_shm_area *area); int snd_user_file(const char *file, char **result); -#ifndef _POSIC_C_SOURCE +#ifndef _POSIX_C_SOURCE struct timeval { time_t tv_sec; /* seconds */ long tv_usec; /* microseconds */ diff --git a/src/control/control_ext.c b/src/control/control_ext.c index 023701a4..3c51cb7e 100644 --- a/src/control/control_ext.c +++ b/src/control/control_ext.c @@ -142,9 +142,9 @@ static int snd_ctl_ext_elem_info(snd_ctl_t *handle, snd_ctl_elem_info_t *info) { int64_t xmin, xmax, xstep; ret = ext->callback->get_integer64_info(ext, key, - &xmin, - &xmax, - &xstep); + (int64_t *)&xmin, + (int64_t *)&xmax, + (int64_t *)&xstep); info->value.integer64.min = xmin; info->value.integer64.max = xmax; info->value.integer64.step = xstep; @@ -265,7 +265,7 @@ static int snd_ctl_ext_elem_write(snd_ctl_t *handle, snd_ctl_elem_value_t *contr case SND_CTL_ELEM_TYPE_INTEGER64: if (! ext->callback->write_integer64) goto err; - ret = ext->callback->write_integer64(ext, key, control->value.integer64.value); + ret = ext->callback->write_integer64(ext, key, (int64_t *)control->value.integer64.value); break; case SND_CTL_ELEM_TYPE_ENUMERATED: if (! ext->callback->write_enumerated) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 05750951..93ff2a98 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -1236,7 +1236,9 @@ int snd_pcm_direct_open_secondary_client(snd_pcm_t **spcmp, snd_pcm_direct_t *dm /* * open a slave PCM as secondary client (dup'ed fd) */ -int snd_pcm_direct_initialize_secondary_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, struct slave_params *params) +int snd_pcm_direct_initialize_secondary_slave(snd_pcm_direct_t *dmix, + snd_pcm_t *spcm, + struct slave_params *params ATTRIBUTE_UNUSED) { int ret; diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c index ef44c02b..860fccf4 100644 --- a/src/pcm/pcm_hooks.c +++ b/src/pcm/pcm_hooks.c @@ -308,7 +308,7 @@ static int snd_pcm_hook_add_conf(snd_pcm_t *pcm, snd_config_t *root, snd_config_ snd_config_t *type = NULL, *args = NULL; snd_config_iterator_t i, next; int (*install_func)(snd_pcm_t *pcm, snd_config_t *args) = NULL; - void *h; + void *h = NULL; if (snd_config_get_type(conf) != SND_CONFIG_TYPE_COMPOUND) { SNDERR("Invalid hook definition"); return -EINVAL; diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c index 63676664..85ac7f84 100644 --- a/src/pcm/pcm_meter.c +++ b/src/pcm/pcm_meter.c @@ -603,7 +603,7 @@ static int snd_pcm_meter_add_scope_conf(snd_pcm_t *pcm, const char *name, int (*open_func)(snd_pcm_t *, const char *, snd_config_t *, snd_config_t *) = NULL; snd_pcm_meter_t *meter = pcm->private_data; - void *h; + void *h = NULL; int err; if (snd_config_get_type(conf) != SND_CONFIG_TYPE_COMPOUND) {