From f21f6ae82a790d6e0ad53bd7eef20842bd443218 Mon Sep 17 00:00:00 2001 From: seanbright Date: Thu, 7 Aug 2008 15:16:48 +0000 Subject: More merges from resolve-shadow warnings: utils/ codecs/ and a change I missed from formats/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@136408 f38db490-d61c-443f-a65b-d21fe96a405b --- codecs/Makefile | 2 +- codecs/codec_dahdi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'codecs') diff --git a/codecs/Makefile b/codecs/Makefile index e45d33e8f..620fb2f19 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -46,7 +46,7 @@ $(LIBLPC10): $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10) $(LIBILBC): - @$(MAKE) -C ilbc all ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" + @$(MAKE) -C ilbc all ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC) diff --git a/codecs/codec_dahdi.c b/codecs/codec_dahdi.c index 2de40f996..e87fa9ce8 100644 --- a/codecs/codec_dahdi.c +++ b/codecs/codec_dahdi.c @@ -362,12 +362,12 @@ static void drop_translator(int dst, int src) static void unregister_translators(void) { - struct translator *cur; + struct translator *current; AST_LIST_LOCK(&translators); - while ((cur = AST_LIST_REMOVE_HEAD(&translators, entry))) { - ast_unregister_translator(&cur->t); - ast_free(cur); + while ((current = AST_LIST_REMOVE_HEAD(&translators, entry))) { + ast_unregister_translator(¤t->t); + ast_free(current); } AST_LIST_UNLOCK(&translators); } -- cgit v1.2.3