summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRichard Mudgett <rmudgett@digium.com>2013-06-27 21:01:04 +0000
committerRichard Mudgett <rmudgett@digium.com>2013-06-27 21:01:04 +0000
commit0008f15a77d1cc89ed3f086edbb6a0b69c2fdf2f (patch)
treec57fb6c659836732f6539b505d62c61e333a7106 /main
parentd416b15c52c470417de96569cc7b94930a6b6df3 (diff)
Change the name of some local variables in bridging.c to reflect what they really mean.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
-rw-r--r--main/bridging.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/main/bridging.c b/main/bridging.c
index feefcbee4..5e5721f91 100644
--- a/main/bridging.c
+++ b/main/bridging.c
@@ -772,10 +772,10 @@ static void bridge_handle_hangup(struct ast_bridge_channel *bridge_channel)
/* Run any hangup hooks. */
iter = ao2_iterator_init(features->hangup_hooks, 0);
for (; (hook = ao2_iterator_next(&iter)); ao2_ref(hook, -1)) {
- int failed;
+ int remove_me;
- failed = hook->callback(bridge_channel->bridge, bridge_channel, hook->hook_pvt);
- if (failed) {
+ remove_me = hook->callback(bridge_channel->bridge, bridge_channel, hook->hook_pvt);
+ if (remove_me) {
ast_debug(1, "Hangup hook %p is being removed from %p(%s)\n",
hook, bridge_channel, ast_channel_name(bridge_channel->chan));
ao2_unlink(features->hangup_hooks, hook);
@@ -2486,10 +2486,10 @@ static void bridge_channel_feature(struct ast_bridge_channel *bridge_channel)
/* If a hook was actually matched execute it on this channel, otherwise stream up the DTMF to the other channels */
if (hook) {
- int failed;
+ int remove_me;
- failed = hook->callback(bridge_channel->bridge, bridge_channel, hook->hook_pvt);
- if (failed) {
+ remove_me = hook->callback(bridge_channel->bridge, bridge_channel, hook->hook_pvt);
+ if (remove_me) {
ast_debug(1, "DTMF hook %p is being removed from %p(%s)\n",
hook, bridge_channel, ast_channel_name(bridge_channel->chan));
ao2_unlink(features->dtmf_hooks, hook);