[asterisk-commits] twilson: branch twilson/my_crucible_test r330992 - /team/twilson/my_crucible_...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Fri Aug 5 14:57:26 CDT 2011
Author: twilson
Date: Fri Aug 5 14:57:22 2011
New Revision: 330992
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=330992
Log:
Make coding guidelines changes for test
Modified:
team/twilson/my_crucible_test/channels/chan_sip.c
Modified: team/twilson/my_crucible_test/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/twilson/my_crucible_test/channels/chan_sip.c?view=diff&rev=330992&r1=330991&r2=330992
==============================================================================
--- team/twilson/my_crucible_test/channels/chan_sip.c (original)
+++ team/twilson/my_crucible_test/channels/chan_sip.c Fri Aug 5 14:57:22 2011
@@ -6492,16 +6492,19 @@
int ret = -1;
struct sip_pvt *p;
- if (newchan && ast_test_flag(newchan, AST_FLAG_ZOMBIE))
+ if (newchan && ast_test_flag(newchan, AST_FLAG_ZOMBIE)) {
ast_debug(1, "New channel is zombie\n");
- if (oldchan && ast_test_flag(oldchan, AST_FLAG_ZOMBIE))
+ }
+ if (oldchan && ast_test_flag(oldchan, AST_FLAG_ZOMBIE)) {
ast_debug(1, "Old channel is zombie\n");
+ }
if (!newchan || !newchan->tech_pvt) {
- if (!newchan)
+ if (!newchan) {
ast_log(LOG_WARNING, "No new channel! Fixup of %s failed.\n", oldchan->name);
- else
+ } else {
ast_log(LOG_WARNING, "No SIP tech_pvt! Fixup of %s failed.\n", oldchan->name);
+ }
return -1;
}
p = newchan->tech_pvt;
@@ -6509,9 +6512,9 @@
sip_pvt_lock(p);
append_history(p, "Masq", "Old channel: %s\n", oldchan->name);
append_history(p, "Masq (cont)", "...new owner: %s\n", newchan->name);
- if (p->owner != oldchan)
- ast_log(LOG_WARNING, "old channel wasn't %p but was %p\n", oldchan, p->owner);
- else {
+ if (p->owner != oldchan) {
+ ast_log(LOG_WARNING, "Old channel wasn't %p but was %p\n", oldchan, p->owner);
+ } else {
p->owner = newchan;
/* Re-invite RTP back to Asterisk. Needed if channel is masqueraded out of a native
RTP bridge (i.e., RTP not going through Asterisk): RTP bridge code might not be
More information about the asterisk-commits
mailing list