From e43bc6634dc60ca897a848ca3301f52c74330279 Mon Sep 17 00:00:00 2001 From: Luigi 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: https://origsvn.digium.com/svn/asterisk/trunk@20003 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_getcpeid.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'apps/app_getcpeid.c') diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c index e9ada0b6f..5baab8676 100644 --- a/apps/app_getcpeid.c +++ b/apps/app_getcpeid.c @@ -43,8 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/adsi.h" #include "asterisk/options.h" -static char *tdesc = "Get ADSI CPE ID"; - static char *app = "GetCPEID"; static char *synopsis = "Get ADSI CPE ID"; @@ -133,7 +131,7 @@ static int cpeid_exec(struct ast_channel *chan, void *idata) return res; } -int unload_module(void) +static int unload_module(void *mod) { int res; @@ -144,24 +142,19 @@ int unload_module(void) return res; } -int load_module(void) +static int load_module(void *mod) { return ast_register_application(app, cpeid_exec, synopsis, descrip); } -const char *description(void) +static const char *description(void) { - return tdesc; + return "Get ADSI CPE ID"; } -int usecount(void) -{ - int res; - STANDARD_USECOUNT(res); - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD1; -- cgit v1.2.3