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_odbc.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_odbc.c')
| -rw-r--r-- | cdr/cdr_odbc.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/cdr/cdr_odbc.c b/cdr/cdr_odbc.c index e7bafb886..51d77a140 100644 --- a/cdr/cdr_odbc.c +++ b/cdr/cdr_odbc.c @@ -64,7 +64,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define DATE_FORMAT "%Y-%m-%d %T" -static char *desc = "ODBC CDR Backend"; static char *name = "ODBC"; static char *config = "cdr_odbc.conf"; static char *dsn = NULL, *username = NULL, *password = NULL, *table = NULL; @@ -207,11 +206,6 @@ static int odbc_log(struct ast_cdr *cdr) return 0; } -static const char *description(void) -{ - return desc; -} - static int odbc_unload_module(void) { ast_mutex_lock(&odbc_lock); @@ -365,7 +359,7 @@ static int odbc_load_module(void) ast_verbose( VERBOSE_PREFIX_3 "cdr_odbc: Unable to connect to datasource: %s\n", dsn); } } - res = ast_cdr_register(name, desc, odbc_log); + res = ast_cdr_register(name, ast_module_info->description, odbc_log); if (res) { ast_log(LOG_ERROR, "cdr_odbc: Unable to register ODBC CDR handling\n"); } @@ -452,25 +446,24 @@ static int odbc_init(void) return 0; } -static int load_module(void *mod) +static int load_module(void) { return odbc_load_module(); } -static int unload_module(void *mod) +static int unload_module(void) { return odbc_unload_module(); } -static int reload(void *mod) +static int reload(void) { odbc_unload_module(); return odbc_load_module(); } -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_0, reload, NULL, NULL); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ODBC CDR Backend", + .load = load_module, + .unload = unload_module, + .reload = reload, + ); |