[svn-commits] dvossel: branch dvossel/call_forward_api_trunk r198651 - in /team/dvossel/cal...

[SVN commits to the Digium repositories]

Author: dvossel
Date: Mon Jun  1 14:21:20 2009
New Revision: 198651

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198651
Log:
Coding guildline fixups.

Modified:
    team/dvossel/call_forward_api_trunk/include/asterisk/channel.h
    team/dvossel/call_forward_api_trunk/main/channel.c

Modified: team/dvossel/call_forward_api_trunk/include/asterisk/channel.h
URL: http://svn.asterisk.org/svn-view/asterisk/team/dvossel/call_forward_api_trunk/include/asterisk/channel.h?view=diff&rev=198651&r1=198650&r2=198651
==============================================================================
--- team/dvossel/call_forward_api_trunk/include/asterisk/channel.h (original)
+++ team/dvossel/call_forward_api_trunk/include/asterisk/channel.h Mon Jun  1 14:21:20 2009
@@ -1086,7 +1086,7 @@
  * \param orig channel being replaced by the call forward channel
  * \param timeout maximum amount of time to wait for setup of new forward channel
  * \param format requested channel format
- * \param oh Outgoing helper used with original channel
+ * \param oh outgoing helper used with original channel
  * \param outstate reason why unsuccessful (if uncuccessful)
  * \return Returns the forwarded call's ast_channel on success or NULL on failure
  */

Modified: team/dvossel/call_forward_api_trunk/main/channel.c
URL: http://svn.asterisk.org/svn-view/asterisk/team/dvossel/call_forward_api_trunk/main/channel.c?view=diff&rev=198651&r1=198650&r2=198651
==============================================================================
--- team/dvossel/call_forward_api_trunk/main/channel.c (original)
+++ team/dvossel/call_forward_api_trunk/main/channel.c Mon Jun  1 14:21:20 2009
@@ -3977,18 +3977,20 @@
 
 	/* Copy/inherit important information into new channel */
 	if (oh) {
-		if (oh->vars)
+		if (oh->vars) {
 			ast_set_variables(new, oh->vars);
-		/* XXX why is this necessary, for the parent_channel perhaps ? */
-		if (!ast_strlen_zero(oh->cid_num) && !ast_strlen_zero(oh->cid_name))
+		}
+		if (!ast_strlen_zero(oh->cid_num) && !ast_strlen_zero(oh->cid_name)) {
 			ast_set_callerid(new, oh->cid_num, oh->cid_name, oh->cid_num);
+		}
 		if (oh->parent_channel) {
 			ast_channel_update_redirecting(oh->parent_channel, apr);
 			ast_channel_inherit_variables(oh->parent_channel, new);
 			ast_channel_datastore_inherit(oh->parent_channel, new);
 		}
-		if (oh->account)
+		if (oh->account) {
 			ast_cdr_setaccount(new, oh->account);
+		}
 	} else if (caller) { /* no outgoing helper so use caller if avaliable */
 		ast_channel_update_redirecting(caller, apr);
 		ast_channel_inherit_variables(caller, new);