mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-17 23:38:23 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user