aboutsummaryrefslogtreecommitdiffstats
path: root/channel.c
diff options
context:
space:
mode:
authorcitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-06 21:04:22 +0000
committercitats <citats@f38db490-d61c-443f-a65b-d21fe96a405b>2004-05-06 21:04:22 +0000
commit07aec9c5fb37e85cfb72912506fa4515f0837d8e (patch)
treed166e241d1a38e47c0abcc72535a39e806377a0c /channel.c
parent23d20ec90f243748b86a39a79d9a6424c1918772 (diff)
Use ast_strlen_zero in channel.c
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2910 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channel.c')
-rwxr-xr-xchannel.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/channel.c b/channel.c
index ce524ecdd..4f593d844 100755
--- 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)) {