ast_calloc() already reports OOM conditions
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 15 Jun 2006 12:30:45 +0000 (12:30 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 15 Jun 2006 12:30:45 +0000 (12:30 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@34241 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_odbc.c

index ca8007c..c2df9b0 100644 (file)
@@ -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;
                                        }