From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Thu, 15 Jun 2006 12:30:45 +0000 (+0000)
Subject: ast_calloc() already reports OOM conditions
X-Git-Tag: 1.4.0-beta1~886
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14ebe471c510c2ba876d1baf638a3624a8c4f02a;p=thirdparty%2Fasterisk.git

ast_calloc() already reports OOM conditions


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34241 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_odbc.c b/res/res_odbc.c
index ca8007ce6c..c2df9b0e34 100644
--- a/res/res_odbc.c
+++ b/res/res_odbc.c
@@ -256,7 +256,6 @@ static int load_odbc_config(void)
 					new = ast_calloc(1, sizeof(*new));
 
 					if (!new) {
-						ast_log(LOG_ERROR, "Memory error while loading configuration.\n");
 						res = -1;
 						break;
 					}
@@ -397,7 +396,6 @@ struct odbc_obj *odbc_request_obj(const char *name, int check)
 			class->count++;
 			obj = ast_calloc(1, sizeof(*obj));
 			if (!obj) {
-				ast_log(LOG_ERROR, "Out of memory\n");
 				AST_LIST_UNLOCK(&class->odbc_obj);
 				return NULL;
 			}
@@ -417,7 +415,6 @@ struct odbc_obj *odbc_request_obj(const char *name, int check)
 			/* No entry: build one */
 			obj = ast_calloc(1, sizeof(*obj));
 			if (!obj) {
-				ast_log(LOG_ERROR, "Out of memory\n");
 				AST_LIST_UNLOCK(&class->odbc_obj);
 				return NULL;
 			}
@@ -589,7 +586,6 @@ static int reload(void *mod)
 					}
 
 					if (!new) {
-						ast_log(LOG_ERROR, "Memory error while loading configuration.\n");
 						res = -1;
 						break;
 					}