aboutsummaryrefslogtreecommitdiffstats
path: root/channel.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-11 10:28:22 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-11 10:28:22 +0000
commita70bb424d8ec3dd3484aed1041c9ca6a687b650b (patch)
tree42a6dfd2f35cad833d04c80363cc4cb126857dd0 /channel.c
parent1e6b4edbebfa17463c6dd73ac0c0891aee277032 (diff)
initialize the bridge result to 'no result', so that we can check for code paths that set it to AST_BRIDGE_COMPLETE inside the loop (thanks Oskar!)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@26849 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rw-r--r--channel.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channel.c b/channel.c
index e341ae30b..750f1ffe9 100644
--- a/channel.c
+++ b/channel.c
@@ -3276,7 +3276,7 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
/* Copy voice back and forth between the two channels. */
struct ast_channel *cs[3];
struct ast_frame *f;
- enum ast_bridge_result res = AST_BRIDGE_COMPLETE;
+ enum ast_bridge_result res = 0;
int o0nativeformats;
int o1nativeformats;
int watch_c0_dtmf;
@@ -3345,7 +3345,7 @@ static enum ast_bridge_result ast_generic_bridge(struct ast_channel *c0, struct
default:
*fo = f;
*rc = who;
- res = AST_BRIDGE_COMPLETE;
+ res = AST_BRIDGE_COMPLETE;
ast_log(LOG_DEBUG, "Got a FRAME_CONTROL (%d) frame on channel %s\n", f->subclass, who->name);
break;
}