diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 00:25:44 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-10-04 00:25:44 +0000 |
| commit | 0a73226dee659edfb767d94caa161c5eb1770efc (patch) | |
| tree | de58b7cde77358d46b206f503d39fbbf3af17471 /main/loader.c | |
| parent | e225c770d1d5319b1442606829a92d8d73db8ea8 (diff) | |
ensure that local include files are always used
avoid a duplicate function name (term_init())
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@44322 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 23aec019a..e31dfaa88 100644 --- a/main/loader.c +++ b/main/loader.c @@ -359,7 +359,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; } @@ -372,6 +372,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(), @@ -394,7 +395,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; @@ -411,7 +412,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; } |