mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-13 08:13:22 +00:00
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
This commit is contained in:
@@ -772,10 +772,10 @@ static void bridge_handle_hangup(struct ast_bridge_channel *bridge_channel)
|
|||||||
/* Run any hangup hooks. */
|
/* Run any hangup hooks. */
|
||||||
iter = ao2_iterator_init(features->hangup_hooks, 0);
|
iter = ao2_iterator_init(features->hangup_hooks, 0);
|
||||||
for (; (hook = ao2_iterator_next(&iter)); ao2_ref(hook, -1)) {
|
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);
|
remove_me = hook->callback(bridge_channel->bridge, bridge_channel, hook->hook_pvt);
|
||||||
if (failed) {
|
if (remove_me) {
|
||||||
ast_debug(1, "Hangup hook %p is being removed from %p(%s)\n",
|
ast_debug(1, "Hangup hook %p is being removed from %p(%s)\n",
|
||||||
hook, bridge_channel, ast_channel_name(bridge_channel->chan));
|
hook, bridge_channel, ast_channel_name(bridge_channel->chan));
|
||||||
ao2_unlink(features->hangup_hooks, hook);
|
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 a hook was actually matched execute it on this channel, otherwise stream up the DTMF to the other channels */
|
||||||
if (hook) {
|
if (hook) {
|
||||||
int failed;
|
int remove_me;
|
||||||
|
|
||||||
failed = hook->callback(bridge_channel->bridge, bridge_channel, hook->hook_pvt);
|
remove_me = hook->callback(bridge_channel->bridge, bridge_channel, hook->hook_pvt);
|
||||||
if (failed) {
|
if (remove_me) {
|
||||||
ast_debug(1, "DTMF hook %p is being removed from %p(%s)\n",
|
ast_debug(1, "DTMF hook %p is being removed from %p(%s)\n",
|
||||||
hook, bridge_channel, ast_channel_name(bridge_channel->chan));
|
hook, bridge_channel, ast_channel_name(bridge_channel->chan));
|
||||||
ao2_unlink(features->dtmf_hooks, hook);
|
ao2_unlink(features->dtmf_hooks, hook);
|
||||||
|
Reference in New Issue
Block a user