diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-06-04 22:51:04 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-06-04 22:51:04 +0000 |
| commit | dcf5990c56dad2692f24cc31746daa0441091505 (patch) | |
| tree | 89329b1d8e6899ad56177d2951c1bccfe54c6fb9 /bridges | |
| parent | cc97274d3b6392baa96e63fa183803185bd58019 (diff) | |
Simple lock, assignment, unlock sandwich optimization.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@390439 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_native_rtp.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bridges/bridge_native_rtp.c b/bridges/bridge_native_rtp.c index 1117e5aed..5b03726c5 100644 --- a/bridges/bridge_native_rtp.c +++ b/bridges/bridge_native_rtp.c @@ -18,7 +18,7 @@ /*! \file * - * \brief Native RTP bridging module + * \brief Native RTP bridging technology module * * \author Joshua Colp <jcolp@digium.com> * @@ -251,15 +251,13 @@ static int native_rtp_bridge_framehook_attach(struct ast_bridge_channel *bridge_ } ast_channel_lock(bridge_channel->chan); - - if (!(data->id = ast_framehook_attach(bridge_channel->chan, &hook)) < 0) { - ast_channel_unlock(bridge_channel->chan); + data->id = ast_framehook_attach(bridge_channel->chan, &hook); + ast_channel_unlock(bridge_channel->chan); + if (!data->id < 0) { ao2_cleanup(data); return -1; } - ast_channel_unlock(bridge_channel->chan); - bridge_channel->bridge_pvt = data; return 0; |