diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /cdr/cdr_csv.c | |
parent | a42edc84034f91932a3e12d503e07f76a6eb498a (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr/cdr_csv.c')
-rw-r--r-- | cdr/cdr_csv.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index b1612f4b2..a599fb08f 100644 --- a/cdr/cdr_csv.c +++ b/cdr/cdr_csv.c @@ -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; + return 0; } -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, + ); |