diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-05 16:01:32 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-05 16:01:32 +0000 |
| commit | fcf28e47cd93d3957afb27cfac49fbd40a639c2b (patch) | |
| tree | 28f1c2e200a0e9155ecf39db1bd587000e978891 /main/loader.c | |
| parent | 07a72fb19f2584930bb895544e1575b6801d3a09 (diff) | |
Merged revisions 120602 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r120602 | tilghman | 2008-06-05 10:58:11 -0500 (Thu, 05 Jun 2008) | 4 lines
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/branches/1.6.0@120603 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/loader.c')
| -rw-r--r-- | main/loader.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/loader.c b/main/loader.c index c081cb233..7dc9f1e11 100644 --- a/main/loader.c +++ b/main/loader.c @@ -722,11 +722,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 { |