mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 03:20:57 +00:00
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:
@@ -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)
|
||||
|
||||
|
@@ -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);
|
||||
}
|
||||
|
Reference in New Issue
Block a user