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 --- res/res_speech.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) (limited to 'res/res_speech.c') diff --git a/res/res_speech.c b/res/res_speech.c index 58ef56447..32b15d79e 100644 --- a/res/res_speech.c +++ b/res/res_speech.c @@ -41,7 +41,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$"); #include "asterisk/options.h" #include "asterisk/speech.h" -static char *tdesc = "Generic Speech Recognition API"; static AST_LIST_HEAD_STATIC(engines, ast_speech_engine); static struct ast_speech_engine *default_engine = NULL; @@ -337,13 +336,13 @@ int ast_speech_unregister(char *engine_name) return res; } -int unload_module(void) +static int unload_module(void *mod) { /* We can not be unloaded */ return -1; } -int load_module(void) +static int load_module(void *mod) { int res = 0; @@ -353,24 +352,14 @@ int load_module(void) return res; } -int reload(void) +static const char *description(void) { - return 0; + return "Generic Speech Recognition API"; } -const char *description(void) -{ - return tdesc; -} - -int usecount(void) -{ - int res = 0; - - return res; -} - -const char *key() +static const char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_0 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL); -- cgit v1.2.3