[Asterisk-cvs] asterisk channel.c,1.106,1.107

[citats at lists.digium.com]

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

Modified Files:
	channel.c 
Log Message:
Use ast_strlen_zero in channel.c


Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- channel.c	3 May 2004 02:02:27 -0000	1.106
+++ channel.c	6 May 2004 21:04:22 -0000	1.107
@@ -37,6 +37,7 @@
 #include <asterisk/indications.h>
 #include <asterisk/monitor.h>
 #include <asterisk/causes.h>
+#include <asterisk/utils.h>
 #ifdef ZAPTEL_OPTIMIZATIONS
 #include <sys/ioctl.h>
 #include <linux/zaptel.h>
@@ -1128,7 +1129,7 @@
 		return NULL;
 	}
 
-	if (!chan->deferdtmf && strlen(chan->dtmfq)) {
+	if (!chan->deferdtmf && !ast_strlen_zero(chan->dtmfq)) {
 		/* We have DTMF that has been deferred.  Return it now */
 		chan->dtmff.frametype = AST_FRAME_DTMF;
 		chan->dtmff.subclass = chan->dtmfq[0];
@@ -1653,7 +1654,7 @@
 			if (oh->account && *oh->account)
 				ast_cdr_setaccount(chan, oh->account);
 		}
-		if (callerid && strlen(callerid))
+		if (callerid && !ast_strlen_zero(callerid))
 			ast_set_callerid(chan, callerid, 1);
 
 		if (!ast_call(chan, data, 0)) {