diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 00:26:21 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 00:26:21 +0000 |
commit | cdae839f80c827934702a33d592a2137fb77f8aa (patch) | |
tree | db50802df6ebd873ba2c249b4c9a094410bcea5a /main/loader.c | |
parent | 38f062988659847550e63f87284d9d3045b91423 (diff) |
Merged revisions 44322 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r44322 | kpfleming | 2006-10-03 19:25:44 -0500 (Tue, 03 Oct 2006) | 3 lines
ensure that local include files are always used
avoid a duplicate function name (term_init())
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@44323 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/loader.c')
-rw-r--r-- | main/loader.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/main/loader.c b/main/loader.c index 8b149f2d7..dd33f9b1e 100644 --- a/main/loader.c +++ b/main/loader.c @@ -360,7 +360,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned strcpy(resource_being_loaded->resource, resource); if (!(lib = dlopen(fn, RTLD_LAZY | RTLD_LOCAL))) { - ast_log(LOG_WARNING, "%s\n", dlerror()); + ast_log(LOG_WARNING, "Error loading module '%s': %s\n", resource_in, dlerror()); free(resource_being_loaded); return NULL; } @@ -373,6 +373,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned module_list */ if (resource_being_loaded != (mod = AST_LIST_LAST(&module_list))) { + ast_log(LOG_WARNING, "Module '%s' did not register itself during load\n", resource_in); /* no, it did not, so close it and return */ while (!dlclose(lib)); /* note that the module's destructor will call ast_module_unregister(), @@ -395,7 +396,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned */ #if HAVE_RTLD_NOLOAD if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) { - ast_log(LOG_WARNING, "%s\n", dlerror()); + ast_log(LOG_WARNING, "Unable to promot flags on module '%s': %s\n", resource_in, dlerror()); while (!dlclose(lib)); free(resource_being_loaded); return NULL; @@ -412,7 +413,7 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned strcpy(resource_being_loaded->resource, resource); if (!(lib = dlopen(fn, wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) { - ast_log(LOG_WARNING, "%s\n", dlerror()); + ast_log(LOG_WARNING, "Error loading module '%s': %s\n", resource_in, dlerror()); free(resource_being_loaded); return NULL; } |