[Asterisk-cvs] asterisk/channels chan_misdn.c, 1.4, 1.5 chan_sip.c, 1.906, 1.907

[kpfleming]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv14656/channels

Modified Files:
	chan_misdn.c chan_sip.c 
Log Message:
issue #5648


Index: chan_misdn.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_misdn.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- chan_misdn.c	8 Nov 2005 00:02:53 -0000	1.4
+++ chan_misdn.c	8 Nov 2005 01:55:30 -0000	1.5
@@ -3466,7 +3466,7 @@
 		return -1;
 	}
 	
-	if (!data || ast_strlen_zero((char *)data)) {
+	if (ast_strlen_zero((char *)data)) {
 		ast_log(LOG_WARNING, "misdn_facility Requires arguments\n");
 		return -1;
 	}
@@ -3509,7 +3509,7 @@
 		return -1;
 	}
 	
-	if (!data || ast_strlen_zero((char *)data)) {
+	if (ast_strlen_zero((char *)data)) {
 		ast_log(LOG_WARNING, "misdn_set_opt Requires arguments\n");
 		return -1;
 	}

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -d -r1.906 -r1.907
--- chan_sip.c	31 Oct 2005 23:38:40 -0000	1.906
+++ chan_sip.c	8 Nov 2005 01:55:30 -0000	1.907
@@ -4845,14 +4845,14 @@
 			add_header(&req, "Referred-By", p->referred_by);
 	}
 #ifdef OSP_SUPPORT
-	if (p->options && p->options->osptoken && !ast_strlen_zero(p->options->osptoken)) {
+	if (p->options && !ast_strlen_zero(p->options->osptoken)) {
 		ast_log(LOG_DEBUG,"Adding OSP Token: %s\n", p->options->osptoken);
 		add_header(&req, "P-OSP-Auth-Token", p->options->osptoken);
 	} else {
 		ast_log(LOG_DEBUG,"NOT Adding OSP Token\n");
 	}
 #endif
-	if (p->options && p->options->distinctive_ring && !ast_strlen_zero(p->options->distinctive_ring))
+	if (p->options && !ast_strlen_zero(p->options->distinctive_ring))
 	{
 		add_header(&req, "Alert-Info", p->options->distinctive_ring);
 	}