More merges from resolve-shadow warnings:

utils/
  codecs/
  and a change I missed from formats/


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@136408 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-08-07 15:16:48 +00:00
parent 8397209316
commit 6305009cfc
8 changed files with 107 additions and 108 deletions

View File

@@ -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)

View File

@@ -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(&current->t);
ast_free(current);
}
AST_LIST_UNLOCK(&translators);
}