[asterisk-commits] alecdavis: branch 1.6.2 r312213 - /branches/1.6.2/apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: alecdavis
Date: Fri Apr  1 04:16:26 2011
New Revision: 312213

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=312213
Log:
fix up bad merge46 extra 2 yuck: labels

Modified:
    branches/1.6.2/apps/app_voicemail.c

Modified: branches/1.6.2/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/apps/app_voicemail.c?view=diff&rev=312213&r1=312212&r2=312213
==============================================================================
--- branches/1.6.2/apps/app_voicemail.c (original)
+++ branches/1.6.2/apps/app_voicemail.c Fri Apr  1 04:16:26 2011
@@ -3662,9 +3662,7 @@
 	} 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 @@
 	}
 	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;
 }