[asterisk-commits] qwell: trunk r69081 - in /trunk: channels/chan_sip.c main/pbx.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Wed Jun 13 12:06:53 2007
New Revision: 69081

URL: http://svn.digium.com/view/asterisk?view=rev&rev=69081
Log:
Fixes for ast_strlen_zero() janitor project.

Issue 9968, patch by eliel.

Modified:
    trunk/channels/chan_sip.c
    trunk/main/pbx.c

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=69081&r1=69080&r2=69081
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jun 13 12:06:53 2007
@@ -7494,7 +7494,7 @@
 	}
 	/* This new INVITE is part of an attended transfer. Make sure that the
 	other end knows and replace the current call with this new call */
-	if (p->options && p->options->replaces && !ast_strlen_zero(p->options->replaces)) {
+	if (p->options && !ast_strlen_zero(p->options->replaces)) {
 		add_header(&req, "Replaces", p->options->replaces);
 		add_header(&req, "Require", "replaces");
 	}
@@ -15025,7 +15025,7 @@
 			pbx_builtin_setvar_helper(current.chan2, "_SIPTRANSFER_REFERER", p->refer->referred_by);
 	}
 	/* Generate a Replaces string to be used in the INVITE during attended transfer */
-	if (p->refer->replaces_callid && !ast_strlen_zero(p->refer->replaces_callid)) {
+	if (!ast_strlen_zero(p->refer->replaces_callid)) {
 		char tempheader[BUFSIZ];
 		snprintf(tempheader, sizeof(tempheader), "%s%s%s%s%s", p->refer->replaces_callid, 
 				p->refer->replaces_callid_totag ? ";to-tag=" : "", 

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=69081&r1=69080&r2=69081
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Wed Jun 13 12:06:53 2007
@@ -3746,7 +3746,7 @@
 	/* Variables used for different counters */
 	struct dialplan_counters counters;
 
-	if (id && !ast_strlen_zero(id))
+	if (!ast_strlen_zero(id))
 		snprintf(idtext, sizeof(idtext), "ActionID: %s\r\n", id);
 	else
 		idtext[0] = '\0';