From 3c8d8caca1a71635a0a75419e62453c830a902b4 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Thu, 18 May 2006 16:31:16 +0000 Subject: [PATCH] Return -1 on error in ODBC messagecount and 0 on success (issue #7133 reported by cfieldmtm) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@28212 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 35eedeca69..214c7aff3c 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -2006,7 +2006,7 @@ static char *mbox(int id) #ifdef USE_ODBC_STORAGE static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs) { - int x = 0; + int x = -1; int res; SQLHSTMT stmt; char sql[256]; @@ -2018,6 +2018,7 @@ static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs) *newmsgs = 0; if (oldmsgs) *oldmsgs = 0; + /* If no mailbox, return immediately */ if (ast_strlen_zero(mailbox)) return 0; @@ -2099,7 +2100,7 @@ static int messagecount(const char *mailbox, int *newmsgs, int *oldmsgs) } SQLFreeHandle (SQL_HANDLE_STMT, stmt); *oldmsgs = atoi(rowdata); - x = 1; + x = 0; } else ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); -- 2.47.2