[asterisk-commits] trunk r34241 - /trunk/res/res_odbc.c

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Jun 15 05:30:45 MST 2006


Author: tilghman
Date: Thu Jun 15 07:30:45 2006
New Revision: 34241

URL: http://svn.digium.com/view/asterisk?rev=34241&view=rev
Log:
ast_calloc() already reports OOM conditions

Modified:
    trunk/res/res_odbc.c

Modified: trunk/res/res_odbc.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_odbc.c?rev=34241&r1=34240&r2=34241&view=diff
==============================================================================
--- trunk/res/res_odbc.c (original)
+++ trunk/res/res_odbc.c Thu Jun 15 07:30:45 2006
@@ -256,7 +256,6 @@
 					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 @@
 			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 @@
 			/* 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 @@
 					}
 
 					if (!new) {
-						ast_log(LOG_ERROR, "Memory error while loading configuration.\n");
 						res = -1;
 						break;
 					}



More information about the asterisk-commits mailing list