[asterisk-commits] dvossel: branch dvossel/call_forward_api_trunk r198855 - /team/dvossel/call_f...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Tue Jun  2 16:07:45 2009
New Revision: 198855

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=198855
Log:
fix a few reviewboard comments


Modified:
    team/dvossel/call_forward_api_trunk/main/channel.c

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=198855&r1=198854&r2=198855
==============================================================================
--- team/dvossel/call_forward_api_trunk/main/channel.c (original)
+++ team/dvossel/call_forward_api_trunk/main/channel.c Tue Jun  2 16:07:45 2009
@@ -3961,10 +3961,7 @@
 		const char *forward_context;
 		ast_channel_lock(orig);
 		forward_context = pbx_builtin_getvar_helper(orig, "FORWARD_CONTEXT");
-		if (ast_strlen_zero(forward_context)) {
-			forward_context = NULL;
-		}
-		snprintf(tmpchan, sizeof(tmpchan), "%s@%s", orig->call_forward, forward_context ? forward_context : orig->context);
+		snprintf(tmpchan, sizeof(tmpchan), "%s@%s", orig->call_forward, S_OR(forward_context, orig->context));
 		ast_channel_unlock(orig);
 		data = tmpchan;
 		type = "Local";