mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems - support for embedded modules - support for static builds - simpler cross-compilation support - simpler module/loader interface (no exported symbols) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -57,8 +57,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") | ||||
|  | ||||
| AST_MUTEX_DEFINE_STATIC(lock); | ||||
|  | ||||
| static char *desc = "Customizable Comma Separated Values CDR Backend"; | ||||
|  | ||||
| static char *name = "cdr-custom"; | ||||
|  | ||||
| static FILE *mf = NULL; | ||||
| @@ -137,12 +135,7 @@ static int custom_log(struct ast_cdr *cdr) | ||||
| 	return 0; | ||||
| } | ||||
|  | ||||
| static const char *description(void) | ||||
| { | ||||
| 	return desc; | ||||
| } | ||||
|  | ||||
| static int unload_module(void *mod) | ||||
| static int unload_module(void) | ||||
| { | ||||
| 	if (mf) | ||||
| 		fclose(mf); | ||||
| @@ -150,12 +143,12 @@ static int unload_module(void *mod) | ||||
| 	return 0; | ||||
| } | ||||
|  | ||||
| static int load_module(void *mod) | ||||
| static int load_module(void) | ||||
| { | ||||
| 	int res = 0; | ||||
|  | ||||
| 	if (!load_config(0)) { | ||||
| 		res = ast_cdr_register(name, desc, custom_log); | ||||
| 		res = ast_cdr_register(name, ast_module_info->description, custom_log); | ||||
| 		if (res) | ||||
| 			ast_log(LOG_ERROR, "Unable to register custom CDR handling\n"); | ||||
| 		if (mf) | ||||
| @@ -164,15 +157,14 @@ static int load_module(void *mod) | ||||
| 	return res; | ||||
| } | ||||
|  | ||||
| static int reload(void *mod) | ||||
| static int reload(void) | ||||
| { | ||||
| 	return load_config(1); | ||||
| } | ||||
|  | ||||
| static const char *key(void) | ||||
| { | ||||
| 	return ASTERISK_GPL_KEY; | ||||
| } | ||||
|  | ||||
| STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL); | ||||
| AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Customizable Comma Separated Values CDR Backend", | ||||
| 		.load = load_module, | ||||
| 		.unload = unload_module, | ||||
| 		.reload = reload, | ||||
| 	       ); | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user