From 77b3624bf40de42edd1c6f04cdf41b460da248c3 Mon Sep 17 00:00:00 2001 From: Alec L Davis Date: Fri, 1 Apr 2011 09:16:26 +0000 Subject: [PATCH] fix up bad merge46 extra 2 yuck: labels git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@312213 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_voicemail.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 3e423c3763..fbd7f55b9d 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3662,9 +3662,7 @@ static int store_file(const char *dir, const char *mailboxuser, const char *mail } while (0); if (obj) { ast_odbc_release_obj(obj); - } else - ast_log(AST_LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); -yuck: + } if (cfg) ast_config_destroy(cfg); if (fdm != MAP_FAILED) @@ -4935,12 +4933,8 @@ static int inboxcount2(const char *mailbox, int *urgentmsgs, int *newmsgs, int * } if (obj) { ast_odbc_release_obj(obj); - *oldmsgs = atoi(rowdata); - x = 0; - } else - ast_log(LOG_WARNING, "Failed to obtain database object for '%s'!\n", odbc_database); - -yuck: + } + return x; }