diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-21 17:48:14 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-21 17:48:14 +0000 |
| commit | cd6e2538f2b4beaa8bbc1a63a9b15bcfec9205f5 (patch) | |
| tree | ed55299ece90811b543578536f3a264c7da179f9 /bridges | |
| parent | f3bfece4c3b0ecd77cdde1184f438ceb21572116 (diff) | |
Change several bridge functions to return error status.
The bridge frame queue functions need to return an error status if the
frame failed to be queued because of an error condition. The main calls
that needed to return the status are:
ast_bridge_channel_queue_action_data() and
ast_bridge_channel_write_action_data(). The other return changes are
ripple effects.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_softmix.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bridges/bridge_softmix.c b/bridges/bridge_softmix.c index ac183b28a..8698ff451 100644 --- a/bridges/bridge_softmix.c +++ b/bridges/bridge_softmix.c @@ -378,11 +378,12 @@ static void softmix_bridge_unsuspend(struct ast_bridge *bridge, struct ast_bridg * * \param bridge_channel Which channel source is changing. * - * \return Nothing + * \retval 0 on success. + * \retval -1 on error. */ -static void softmix_src_change(struct ast_bridge_channel *bridge_channel) +static int softmix_src_change(struct ast_bridge_channel *bridge_channel) { - ast_bridge_channel_queue_control_data(bridge_channel, AST_CONTROL_SRCCHANGE, NULL, 0); + return ast_bridge_channel_queue_control_data(bridge_channel, AST_CONTROL_SRCCHANGE, NULL, 0); } /*! \brief Function called when a channel is joined into the bridge */ |