diff options
| author | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2011-05-03 20:45:32 +0000 |
| commit | 37aa52fd78996b5c516ff4c851b60252eda84b05 (patch) | |
| tree | e1651180838e594a0203f863f3cdd084860e1bf5 /channels/chan_unistim.c | |
| parent | 810b9c887949fc4bd9f01dcdc0d3a4f476cb00de (diff) | |
Merged revisions 316265 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r316265 | russell | 2011-05-03 14:55:49 -0500 (Tue, 03 May 2011) | 5 lines
Fix a bunch of compiler warnings generated by gcc 4.6.0.
Most of these are -Wunused-but-set-variable, but there were a few others
mixed in here, as well.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316293 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_unistim.c')
| -rw-r--r-- | channels/chan_unistim.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index faa66f818..8b0f23313 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -1924,7 +1924,7 @@ static int attempt_transfer(struct unistim_subchannel *p1, struct unistim_subcha int res = 0; struct ast_channel *chana = NULL, *chanb = NULL, *bridgea = NULL, *bridgeb = NULL, *peera = - NULL, *peerb = NULL, *peerc = NULL, *peerd = NULL; + NULL, *peerb = NULL, *peerc = NULL; if (!p1->owner || !p2->owner) { ast_log(LOG_WARNING, "Transfer attempted without dual ownership?\n"); @@ -1939,12 +1939,10 @@ static int attempt_transfer(struct unistim_subchannel *p1, struct unistim_subcha peera = chana; peerb = chanb; peerc = bridgea; - peerd = bridgeb; } else if (bridgeb) { peera = chanb; peerb = chana; peerc = bridgeb; - peerd = bridgea; } if (peera && peerb && peerc && (peerb != peerc)) { |