diff options
author | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
---|---|---|
committer | rizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-14 14:08:19 +0000 |
commit | 3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d (patch) | |
tree | b68f48482e463e9c31126b2e3e24fca1dd2f6c82 /res/res_indications.c | |
parent | f9d382fc079246930a99640d7835d6ae3e4149db (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: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_indications.c')
-rw-r--r-- | res/res_indications.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/res/res_indications.c b/res/res_indications.c index 8e468c38a..f4777e3c9 100644 --- a/res/res_indications.c +++ b/res/res_indications.c @@ -50,7 +50,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" /* Globals */ -static const char dtext[] = "Indications Configuration"; static const char config[] = "indications.conf"; /* @@ -364,7 +363,7 @@ static struct ast_cli_entry show_indications_cli = /* * Standard module functions ... */ -int unload_module(void) +static int unload_module(void *mod) { /* remove the registed indications... */ ast_unregister_indication_country(NULL); @@ -379,9 +378,10 @@ int unload_module(void) } -int load_module(void) +static int load_module(void *mod) { - if (ind_load_module()) return -1; + if (ind_load_module()) + return -1; ast_cli_register(&add_indication_cli); ast_cli_register(&remove_indication_cli); @@ -392,7 +392,7 @@ int load_module(void) return 0; } -int reload(void) +static int reload(void *mod) { /* remove the registed indications... */ ast_unregister_indication_country(NULL); @@ -400,18 +400,14 @@ int reload(void) return ind_load_module(); } -const char *description(void) +static const char *description(void) { - /* that the following cast is needed, is yuk! */ - return (char*)dtext; + return "Indications Configuration"; } -int usecount(void) -{ - return 0; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_0 | NO_USECOUNT, reload, NULL, NULL); |