fix a mostly harmless error introduced by svn merge.
authorLuigi Rizzo <rizzo@icir.org>
Fri, 14 Apr 2006 17:19:57 +0000 (17:19 +0000)
committerLuigi Rizzo <rizzo@icir.org>
Fri, 14 Apr 2006 17:19:57 +0000 (17:19 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20036 65c4cc65-6c06-0410-ace0-fbb531ad65f3

loader.c

index d6a0496..5e230db 100644 (file)
--- a/loader.c
+++ b/loader.c
@@ -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 */