summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorSean Bright <sean@malleable.com>2012-03-08 17:02:52 +0000
committerSean Bright <sean@malleable.com>2012-03-08 17:02:52 +0000
commit99bd5b1e2e70160b2d3f6dcbd122b06654c17788 (patch)
treedb17db12c4d7846442c746f0997325801cb96415 /apps
parenta8116350bc47069650de7d08353d8c1c6d6bfe4b (diff)
Eliminate a bunch of shadow warnings.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@358647 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/confbridge/conf_config_parser.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/confbridge/conf_config_parser.c b/apps/confbridge/conf_config_parser.c
index 9bb8b2af9..a73c65820 100644
--- a/apps/confbridge/conf_config_parser.c
+++ b/apps/confbridge/conf_config_parser.c
@@ -711,9 +711,9 @@ static int add_menu_entry(struct conf_menu *menu, const char *dtmf, const char *
/* if adding any of the actions failed, bail */
if (res) {
- struct conf_menu_action *action;
- while ((action = AST_LIST_REMOVE_HEAD(&menu_entry->actions, action))) {
- ast_free(action);
+ struct conf_menu_action *menu_action;
+ while ((menu_action = AST_LIST_REMOVE_HEAD(&menu_entry->actions, action))) {
+ ast_free(menu_action);
}
ast_free(menu_entry);
return -1;