From 5537e1ad1736156bfa71002e899baacb23809fa0 Mon Sep 17 00:00:00 2001 From: James Golovich Date: Mon, 3 May 2004 04:37:03 +0000 Subject: [PATCH] Change strlen calls to ast_strlen_zero in voicemail checking stuff because it is called all the time git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2870 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- app.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app.c b/app.c index 4c4cfab..dcdd91e 100755 --- a/app.c +++ b/app.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "asterisk.h" #include "astconf.h" @@ -153,14 +154,14 @@ int ast_app_has_voicemail(const char *mailbox) char *context; int ret; /* If no mailbox, return immediately */ - if (!strlen(mailbox)) + if (ast_strlen_zero(mailbox)) return 0; if (strchr(mailbox, ',')) { strncpy(tmp, mailbox, sizeof(tmp)); mb = tmp; ret = 0; while((cur = strsep(&mb, ","))) { - if (strlen(cur)) { + if (!ast_strlen_zero(cur)) { if (ast_app_has_voicemail(cur)) return 1; } @@ -202,7 +203,7 @@ int ast_app_messagecount(const char *mailbox, int *newmsgs, int *oldmsgs) if (oldmsgs) *oldmsgs = 0; /* If no mailbox, return immediately */ - if (!strlen(mailbox)) + if (ast_strlen_zero(mailbox)) return 0; if (strchr(mailbox, ',')) { int tmpnew, tmpold; @@ -210,7 +211,7 @@ int ast_app_messagecount(const char *mailbox, int *newmsgs, int *oldmsgs) mb = tmp; ret = 0; while((cur = strsep(&mb, ", "))) { - if (strlen(cur)) { + if (!ast_strlen_zero(cur)) { if (ast_app_messagecount(cur, newmsgs ? &tmpnew : NULL, oldmsgs ? &tmpold : NULL)) return -1; else { -- 1.7.9.5