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 /res/res_config_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 'res/res_config_odbc.c')
| -rw-r--r-- | res/res_config_odbc.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index a964ee75f..0c1ff713a 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -52,8 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/res_odbc.h" #include "asterisk/utils.h" -LOCAL_USER_DECL; - static struct ast_variable *realtime_odbc(const char *database, const char *table, va_list ap) { struct odbc_obj *obj; @@ -574,16 +572,16 @@ static struct ast_config_engine odbc_engine = { .update_func = update_odbc }; -static int unload_module (void *mod) +static int unload_module (void) { - ast_hangup_localusers(mod); + ast_module_user_hangup_all(); ast_config_engine_deregister(&odbc_engine); if (option_verbose) ast_verbose("res_config_odbc unloaded.\n"); return 0; } -static int load_module (void *mod) +static int load_module (void) { ast_config_engine_register(&odbc_engine); if (option_verbose) @@ -591,14 +589,7 @@ static int load_module (void *mod) return 0; } -static const char *description(void) -{ - return "ODBC Configuration"; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "ODBC Configuration", + .load = load_module, + .unload = unload_module, + ); |