aboutsummaryrefslogtreecommitdiffstats
path: root/main/loader.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-05 15:58:11 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-05 15:58:11 +0000
commite387c61e4f71e932c9a81269c34c93b4ff92f0fb (patch)
tree76d189e34c2bb5c6fb520226634fa870939aef0b /main/loader.c
parentede6df540e16ef190ea859e8c477edbee80baca0 (diff)
Conditionally load the AGI command gosub, depending on whether or not res_agi
has been loaded, fix a return value in the loader, and ensure that the help workhorse header does not print on load. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@120602 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/loader.c')
-rw-r--r--main/loader.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/main/loader.c b/main/loader.c
index baddec707..b5a451617 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -726,11 +726,12 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
int ast_load_resource(const char *resource_name)
{
+ int res;
AST_LIST_LOCK(&module_list);
- load_resource(resource_name, 0);
+ res = load_resource(resource_name, 0);
AST_LIST_UNLOCK(&module_list);
- return 0;
+ return res;
}
struct load_order_entry {