mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 10:47:18 +00:00 
			
		
		
		
	remove extraneous warning message
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@19767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		
							
								
								
									
										12
									
								
								loader.c
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								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); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user