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_sqlite.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_sqlite.c')
-rw-r--r-- | cdr/cdr_sqlite.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/cdr/cdr_sqlite.c b/cdr/cdr_sqlite.c index 718ef4838..146f7a209 100644 --- a/cdr/cdr_sqlite.c +++ b/cdr/cdr_sqlite.c @@ -57,7 +57,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") /* When you change the DATE_FORMAT, be sure to change the CHAR(19) below to something else */ #define DATE_FORMAT "%Y-%m-%d %T" -static char *desc = "SQLite CDR Backend"; static char *name = "sqlite"; static sqlite* db = NULL; @@ -166,13 +165,7 @@ static int sqlite_log(struct ast_cdr *cdr) return res; } - -static const char *description(void) -{ - return desc; -} - -static int unload_module(void *mod) +static int unload_module(void) { if (db) sqlite_close(db); @@ -180,7 +173,7 @@ static int unload_module(void *mod) return 0; } -static int load_module(void *mod) +static int load_module(void) { char *zErr; char fn[PATH_MAX]; @@ -208,7 +201,7 @@ static int load_module(void *mod) /* TODO: here we should probably create an index */ } - res = ast_cdr_register(name, desc, sqlite_log); + res = ast_cdr_register(name, ast_module_info->description, sqlite_log); if (res) { ast_log(LOG_ERROR, "Unable to register SQLite CDR handling\n"); return -1; @@ -221,14 +214,4 @@ err: return -1; } -static int reload(void *mod) -{ - return 0; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_0, reload, NULL, NULL); +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "SQLite CDR Backend"); |