mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-03 20:38:59 +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:
		@@ -89,8 +89,6 @@ static char *config = "cdr.conf";
 | 
			
		||||
  "userfield"		user field set via SetCDRUserField 
 | 
			
		||||
----------------------------------------------------------*/
 | 
			
		||||
 | 
			
		||||
static char *desc = "Comma Separated Values CDR Backend";
 | 
			
		||||
 | 
			
		||||
static char *name = "csv";
 | 
			
		||||
 | 
			
		||||
static FILE *mf = NULL;
 | 
			
		||||
@@ -311,12 +309,7 @@ static int csv_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);
 | 
			
		||||
@@ -324,13 +317,13 @@ static int unload_module(void *mod)
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int load_module(void *mod)
 | 
			
		||||
static int load_module(void)
 | 
			
		||||
{
 | 
			
		||||
	int res;
 | 
			
		||||
	
 | 
			
		||||
	load_config();
 | 
			
		||||
 | 
			
		||||
	res = ast_cdr_register(name, desc, csv_log);
 | 
			
		||||
	res = ast_cdr_register(name, ast_module_info->description, csv_log);
 | 
			
		||||
	if (res) {
 | 
			
		||||
		ast_log(LOG_ERROR, "Unable to register CSV CDR handling\n");
 | 
			
		||||
		if (mf)
 | 
			
		||||
@@ -339,15 +332,15 @@ static int load_module(void *mod)
 | 
			
		||||
	return res;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static int reload(void *mod)
 | 
			
		||||
static int reload(void)
 | 
			
		||||
{
 | 
			
		||||
	load_config();
 | 
			
		||||
 | 
			
		||||
	return 0;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
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, "Comma Separated Values CDR Backend",
 | 
			
		||||
		.load = load_module,
 | 
			
		||||
		.unload = unload_module,
 | 
			
		||||
		.reload = reload,
 | 
			
		||||
	       );
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user