From 3c12ea1c8970cf256b2687d511d2182c83971702 Mon Sep 17 00:00:00 2001
From: James Golovich <james@gnuinter.net>
Date: Thu, 28 Oct 2004 15:53:36 +0000
Subject: [PATCH] Cleanup formatting in bug 2741 patch
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4118 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 14 +++++++-------
res/res_features.c | 6 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9fe9eb5e82..b385aa2a71 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6946,11 +6946,11 @@ static int sip_park(struct ast_channel *chan1, struct ast_channel *chan2, struct
return -1;
}
-static void ast_quiet_chan(struct ast_channel *chan) {
- if(chan && chan->_state == AST_STATE_UP) {
- if(chan->generatordata)
+static void ast_quiet_chan(struct ast_channel *chan)
+{
+ if (chan && chan->_state == AST_STATE_UP) {
+ if (chan->generatordata)
ast_deactivate_generator(chan);
-
}
}
@@ -6980,13 +6980,13 @@ static int attempt_transfer(struct sip_pvt *p1, struct sip_pvt *p2)
peera = chana;
peerb = chanb;
peerc = bridgea;
- } else if(bridgeb) {
+ } else if (bridgeb) {
peera = chanb;
peerb = chana;
peerc = bridgeb;
}
- if(peera && peerb && peerc) {
+ if (peera && peerb && peerc) {
ast_quiet_chan(peera);
ast_quiet_chan(peerb);
ast_quiet_chan(peerc);
@@ -7007,7 +7007,7 @@ static int attempt_transfer(struct sip_pvt *p1, struct sip_pvt *p2)
if (ast_channel_masquerade(peerb, peerc)) {
ast_log(LOG_WARNING, "Failed to masquerade %s into %s\n", peerb->name, peerc->name);
- res = -1;
+ res = -1;
}
return res;
} else {
diff --git a/res/res_features.c b/res/res_features.c
index bc10ca5a8d..f79d2b4e29 100755
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -305,9 +305,9 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
char *monitor_exec;
if (chan && peer) {
- pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name);
- pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name);
- } else if (chan)
+ pbx_builtin_setvar_helper(chan, "BRIDGEPEER", peer->name);
+ pbx_builtin_setvar_helper(peer, "BRIDGEPEER", chan->name);
+ } else if (chan)
pbx_builtin_setvar_helper(chan, "BLINDTRANSFER", NULL);
if (monitor_ok) {
--
GitLab