From: Olle Johansson Date: Tue, 14 Mar 2006 07:17:30 +0000 (+0000) Subject: Small fixes to the messagecount function (while trying to understand X-Git-Tag: 1.4.0-beta1~2432 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7aeb45a0da5618a18b67fe3b541086656c068f7a;p=thirdparty%2Fasterisk.git Small fixes to the messagecount function (while trying to understand a bug report...) - Remove unused variable "ret" - Declare char* pointers in the block where they are used git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@12843 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 168c96895c..5a73e3c50d 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2207,10 +2207,9 @@ static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs) DIR *dir; struct dirent *de; char fn[256]; - char tmp[256]=""; - char *mb, *cur; + char tmp[256]; char *context; - int ret; + if (newmsgs) *newmsgs = 0; if (oldmsgs) @@ -2220,9 +2219,10 @@ static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs) return 0; if (strchr(mailbox, ',')) { int tmpnew, tmpold; + char *mb, *cur; + ast_copy_string(tmp, mailbox, sizeof(tmp)); mb = tmp; - ret = 0; while((cur = strsep(&mb, ", "))) { if (!ast_strlen_zero(cur)) { if (messagecount(cur, newmsgs ? &tmpnew : NULL, oldmsgs ? &tmpold : NULL))