Take two, using find_resource on Kevin's suggestion.

Might need better locking support, giving up if we can't get the lock. Right now,
using existing locking in find_resource


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@46582 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 10 deletions

diff --git a/main/loader.c b/main/loader.c
index c0636142a..525eef415 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -871,23 +871,17 @@ int ast_update_module_list(int (*modentry)(const char *module, const char *descr
 	return total_mod_loaded;
 }
 
+/*! \brief Check if module exists */
 int ast_module_check(char *name)
 {
 	struct ast_module *cur;
-	int unlock = -1;
-	int res = 0;
 
 	if (ast_strlen_zero(name))
 		return 0;       /* FALSE */
 
-	if (ast_mutex_trylock(&module_list.lock))
-		unlock = 0;
-	AST_LIST_TRAVERSE(&module_list, cur, entry)
-	if (!res && !strcasecmp(name, cur->resource))
-		res = 1;
-	if (unlock)
-		AST_LIST_UNLOCK(&module_list);
-	return res;
+	cur = find_resource(name, 1);
+
+	return (cur != NULL);
 }