[svn-commits] trunk r20036 - /trunk/loader.c

[svn-commits at lists.digium.com]

Author: rizzo
Date: Fri Apr 14 12:19:57 2006
New Revision: 20036

URL: http://svn.digium.com/view/asterisk?rev=20036&view=rev
Log:
fix a mostly harmless error introduced by svn merge.


Modified:
    trunk/loader.c

Modified: trunk/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/loader.c?rev=20036&r1=20035&r2=20036&view=diff
==============================================================================
--- trunk/loader.c (original)
+++ trunk/loader.c Fri Apr 14 12:19:57 2006
@@ -704,13 +704,11 @@
 
 	/* 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 */