diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 17:19:57 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 17:19:57 +0000 |
commit | d6a1a0b4a20ce97cc755e56b34c92c2da00f277a (patch) | |
tree | 9657b7a9d1a3f7d89c6ee538c237d3326498936e | |
parent | 48dcd9a8521066a1ad8a94908cff20ca44bda786 (diff) |
fix a mostly harmless error introduced by svn merge.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20036 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | loader.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -704,13 +704,11 @@ 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) { - if ((m = find_symbol(cur, "mod_data", 0)) == NULL || - (m->flags & MOD_MASK) == MOD_0) { + if (cur->lib && + ((m = find_symbol(cur, "mod_data", 0)) == NULL || (m->flags & MOD_MASK) == MOD_0)) { /* old-style module, close and reload with standard flags */ - dlclose(cur->lib); - cur->lib = NULL; - } + dlclose(cur->lib); + cur->lib = NULL; m = NULL; } if (cur->lib == NULL) /* try reopen with the old style */ |