From 3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d Mon Sep 17 00:00:00 2001 From: rizzo Date: Fri, 14 Apr 2006 14:08:19 +0000 Subject: 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 --- funcs/func_callerid.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'funcs/func_callerid.c') diff --git a/funcs/func_callerid.c b/funcs/func_callerid.c index b277df1c5..e87ed11a7 100644 --- a/funcs/func_callerid.c +++ b/funcs/func_callerid.c @@ -143,27 +143,24 @@ static struct ast_custom_function callerid_function = { static char *tdesc = "Caller ID related dialplan function"; -int unload_module(void) +static int unload_module(void *mod) { return ast_custom_function_unregister(&callerid_function); } -int load_module(void) +static int load_module(void *mod) { return ast_custom_function_register(&callerid_function); } -const char *description(void) +static const char *description(void) { return tdesc; } -int usecount(void) -{ - return 0; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1 | NO_USECOUNT, NULL, NULL, NULL); -- cgit v1.2.3