Use ast_strlen_zero in channel.c

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2910 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channel.c b/channel.c
index ce524ecdd86ad72b5d6c21456a4854cbb05905c7..4f593d844406535c976ac3dd4962fef917d3f297 100755 (executable)
--- a/channel.c
+++ b/channel.c
@@ -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 @@ struct ast_frame *ast_read(struct ast_channel *chan)
                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 @@ struct ast_channel *__ast_request_and_dial(char *type, int format, void *data, i
                        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)) {