summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-04-13 15:28:24 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-04-13 15:28:24 +0000
commit1dbf98061e98838a0abf3f9d4fb4c9456d7a239c (patch)
tree0f474355714e3238e6c253c43e8b98a03a5a0ac4
parent5af687b83b8a3d5b2f73d8f90bb98abf162b3956 (diff)
remove extraneous warning message
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--loader.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/loader.c b/loader.c
index 593818022..b423084b7 100644
--- a/loader.c
+++ b/loader.c
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster@digium.com>
*
@@ -696,12 +696,12 @@ static struct module * __load_resource(const char *resource_name,
/* open in a sane way */
cur->lib = dlopen(fn, RTLD_NOW | RTLD_LOCAL);
- if (cur->lib == NULL) {
- ast_log(LOG_WARNING, "cannot load %s %s\n", fn, dlerror());
- } else if ( (m1 = find_symbol(cur, "mod_data", 0)) == NULL || m1->type == MOD_0) {
+ if (cur->lib) {
+ if ((m1 = find_symbol(cur, "mod_data", 0)) == NULL || m1->type == MOD_0) {
/* old-style module, close and reload with standard flags */
- dlclose(cur->lib);
- cur->lib = NULL;
+ dlclose(cur->lib);
+ cur->lib = NULL;
+ }
}
if (cur->lib == NULL) /* try reopen with the old style */
cur->lib = dlopen(fn, flags);