[asterisk-commits] seanbright: branch group/asterisk-cpp r168422 - /team/group/asterisk-cpp/main/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sat Jan 10 20:40:42 2009
New Revision: 168422

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=168422
Log:
loader.c is done

Modified:
    team/group/asterisk-cpp/main/loader.c

Modified: team/group/asterisk-cpp/main/loader.c
URL: http://svn.digium.com/svn-view/asterisk/team/group/asterisk-cpp/main/loader.c?view=diff&rev=168422&r1=168421&r2=168422
==============================================================================
--- team/group/asterisk-cpp/main/loader.c (original)
+++ team/group/asterisk-cpp/main/loader.c Sat Jan 10 20:40:42 2009
@@ -125,7 +125,7 @@
 	struct ast_module *mod;
 
 	if (embedding) {
-		if (!(mod = ast_calloc(1, sizeof(*mod) + strlen(info->name) + 1)))
+		if (!(mod = (struct ast_module *) ast_calloc(1, sizeof(*mod) + strlen(info->name) + 1)))
 			return;
 		strcpy(mod->resource, info->name);
 	} else {
@@ -185,7 +185,7 @@
 struct ast_module_user *__ast_module_user_add(struct ast_module *mod,
 					      struct ast_channel *chan)
 {
-	struct ast_module_user *u = ast_calloc(1, sizeof(*u));
+	struct ast_module_user *u = (struct ast_module_user *) ast_calloc(1, sizeof(*u));
 
 	if (!u)
 		return NULL;
@@ -364,7 +364,7 @@
 	   any symbols, and don't export any symbols. this will allow us to peek into
 	   the module's info block (if available) to see what flags it has set */
 
-	resource_being_loaded = ast_calloc(1, space);
+	resource_being_loaded = (struct ast_module *) ast_calloc(1, space);
 	if (!resource_being_loaded)
 		return NULL;
 	strcpy(resource_being_loaded->resource, resource_in);
@@ -720,9 +720,10 @@
 	return res;
 }
 
-int ast_load_resource(const char *resource_name)
-{
-	int res;
+ast_module_load_result ast_load_resource(const char *resource_name)
+{
+	ast_module_load_result res;
+
 	AST_LIST_LOCK(&module_list);
 	res = load_resource(resource_name, 0);
 	AST_LIST_UNLOCK(&module_list);
@@ -746,7 +747,7 @@
 			return NULL;
 	}
 
-	if (!(order = ast_calloc(1, sizeof(*order))))
+	if (!(order = (struct load_order_entry *) ast_calloc(1, sizeof(*order))))
 		return NULL;
 
 	order->resource = ast_strdup(resource);
@@ -979,7 +980,7 @@
 {
 	struct loadupdate *tmp;
 
-	if (!(tmp = ast_malloc(sizeof(*tmp))))
+	if (!(tmp = (struct loadupdate *) ast_malloc(sizeof(*tmp))))
 		return -1;
 
 	tmp->updater = v;