From 7f084af4e4ba7f86d1e191b64cb1a6f144ae6dcb Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 27 Mar 2018 15:16:41 +0200 Subject: [PATCH] a set of fixes to reduce gcc warnings Signed-off-by: Jaroslav Kysela --- aserver/aserver.c | 1 + gitcompile | 2 +- include/pcm.h | 4 +++- src/pcm/pcm_mmap.c | 2 +- src/pcm/pcm_plugin.c | 2 +- src/topology/ctl.c | 2 +- src/topology/pcm.c | 9 +++++---- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/aserver/aserver.c b/aserver/aserver.c index af52cb7f..066414d8 100644 --- a/aserver/aserver.c +++ b/aserver/aserver.c @@ -490,6 +490,7 @@ static int pcm_shm_cmd(client_t *client) case SND_PCM_IOCTL_MMAP: { ctrl->result = snd_pcm_mmap(pcm); + break; } case SND_PCM_IOCTL_MUNMAP: { diff --git a/gitcompile b/gitcompile index e6f709de..2741db4c 100755 --- a/gitcompile +++ b/gitcompile @@ -75,7 +75,7 @@ autoheader automake --foreign --copy --add-missing touch depcomp # seems to be missing for old automake autoconf -export CFLAGS='-O2 -Wall -W -pipe -g' +export CFLAGS='-O2 -Wall -W -Wunused-const-variable=0 -pipe -g' echo "CFLAGS=$CFLAGS" echo "./configure $args" ./configure $args || exit 1 diff --git a/include/pcm.h b/include/pcm.h index e2a53435..5b078231 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -307,7 +307,9 @@ typedef enum _snd_pcm_state { SND_PCM_STATE_SUSPENDED, /** Hardware is disconnected */ SND_PCM_STATE_DISCONNECTED, - SND_PCM_STATE_LAST = SND_PCM_STATE_DISCONNECTED + SND_PCM_STATE_LAST = SND_PCM_STATE_DISCONNECTED, + /** Private - used internally in the library - do not use*/ + SND_PCM_STATE_PRIVATE1 = 1024 } snd_pcm_state_t; /** PCM start mode */ diff --git a/src/pcm/pcm_mmap.c b/src/pcm/pcm_mmap.c index a69cd89c..0d00f266 100644 --- a/src/pcm/pcm_mmap.c +++ b/src/pcm/pcm_mmap.c @@ -417,7 +417,7 @@ int snd_pcm_mmap(snd_pcm_t *pcm) case SND_PCM_AREA_SHM: if (i1->u.shm.shmid != i->u.shm.shmid) continue; - /* follow thru */ + /* fall through */ case SND_PCM_AREA_LOCAL: if (pcm->access != SND_PCM_ACCESS_MMAP_INTERLEAVED && pcm->access != SND_PCM_ACCESS_RW_INTERLEAVED) diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index 0cf9f8cf..ea60eb98 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -587,7 +587,7 @@ int snd_pcm_plugin_may_wait_for_avail_min(snd_pcm_t *pcm, if (available < 0) return 0; - if (available >= pcm->avail_min) + if ((snd_pcm_uframes_t)available >= pcm->avail_min) /* don't wait at all. As we can't configure avail_min * of slave to 0 return here */ diff --git a/src/topology/ctl.c b/src/topology/ctl.c index 9dd88db6..144bf51f 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -888,7 +888,7 @@ int tplg_add_enum(snd_tplg_t *tplg, struct snd_tplg_enum_template *enum_ctl, if (enum_ctl->values != NULL) { for (i = 0; i < num_items; i++) { - if (enum_ctl->values[i]) + if (enum_ctl->values[i] == NULL) continue; memcpy(&ec->values[i * sizeof(int) * ENUM_VAL_SIZE], diff --git a/src/topology/pcm.c b/src/topology/pcm.c index d3836677..bb47b9af 100644 --- a/src/topology/pcm.c +++ b/src/topology/pcm.c @@ -62,7 +62,7 @@ struct tplg_elem *lookup_pcm_dai_stream(struct list_head *base, const char* id) } /* copy referenced caps to the parent (pcm or be dai) */ -static void copy_stream_caps(const char *id, +static void copy_stream_caps(const char *id ATTRIBUTE_UNUSED, struct snd_soc_tplg_stream_caps *caps, struct tplg_elem *ref_elem) { struct snd_soc_tplg_stream_caps *ref_caps = ref_elem->stream_caps; @@ -852,7 +852,8 @@ int tplg_parse_dai(snd_tplg_t *tplg, } /* parse physical link runtime supported HW configs in text conf file */ -static int parse_hw_config_refs(snd_tplg_t *tplg, snd_config_t *cfg, +static int parse_hw_config_refs(snd_tplg_t *tplg ATTRIBUTE_UNUSED, + snd_config_t *cfg, struct tplg_elem *elem) { struct snd_soc_tplg_link_config *link = elem->link; @@ -1370,7 +1371,7 @@ int tplg_add_pcm_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t) static int set_link_hw_config(struct snd_soc_tplg_hw_config *cfg, struct snd_tplg_hw_config_template *tpl) { - int i; + unsigned int i; cfg->size = sizeof(*cfg); cfg->id = tpl->id; @@ -1413,7 +1414,7 @@ int tplg_add_link_object(snd_tplg_t *tplg, snd_tplg_obj_template_t *t) struct snd_tplg_link_template *link_tpl = t->link; struct snd_soc_tplg_link_config *link, *_link; struct tplg_elem *elem; - int i; + unsigned int i; if (t->type != SND_TPLG_TYPE_LINK && t->type != SND_TPLG_TYPE_BE && t->type != SND_TPLG_TYPE_CC) -- 2.47.1