diff options
author | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
---|---|---|
committer | Luigi Rizzo <rizzo@icir.org> | 2006-04-14 14:08:19 +0000 |
commit | e43bc6634dc60ca897a848ca3301f52c74330279 (patch) | |
tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /res/res_config_odbc.c | |
parent | 33a3a7375a4917455495c08c8602bfe453580fd1 (diff) |
This rather large commit changes the way modules are loaded.
As partly documented in loader.c and include/asterisk/module.h,
modules are now expected to return all of their methods and flags
into a structure 'mod_data', and are normally loaded with RTLD_NOW
| RTLD_LOCAL, so symbols are resolved immediately and conflicts
should be less likely. Only in a small number of cases (res_*,
typically) modules are loaded RTLD_GLOBAL, so they can export
symbols.
The core of the change is only the two files loader.c and
include/asterisk/module.h, all the rest is simply adaptation of the
existing modules to the new API, a rather mechanical (but believe
me, time and finger-consuming!) process whose detail you can figure
out by svn diff'ing any single module.
Expect some minor compilation issue after this change, please
report it on mantis http://bugs.digium.com/view.php?id=6968
so we collect all the feedback in one place.
I am just sorry that this change missed SVN version number 20000!
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_config_odbc.c')
-rw-r--r-- | res/res_config_odbc.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/res/res_config_odbc.c b/res/res_config_odbc.c index b28059db5..f2634a93c 100644 --- a/res/res_config_odbc.c +++ b/res/res_config_odbc.c @@ -506,16 +506,16 @@ static struct ast_config_engine odbc_engine = { .update_func = update_odbc }; -int unload_module (void) +static int unload_module (void *mod) { + ast_hangup_localusers(mod); ast_config_engine_deregister(&odbc_engine); if (option_verbose) ast_verbose("res_config_odbc unloaded.\n"); - STANDARD_HANGUP_LOCALUSERS; return 0; } -int load_module (void) +static int load_module (void *mod) { ast_config_engine_register(&odbc_engine); if (option_verbose) @@ -523,19 +523,14 @@ int load_module (void) return 0; } -const char *description(void) +static const char *description(void) { return "ODBC Configuration"; - } -int usecount (void) -{ - /* never unload a config module */ - return 1; -} - -const char *key(void) +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL); |