summaryrefslogtreecommitdiff
path: root/apps/app_dictate.c
diff options
context:
space:
mode:
authorLuigi Rizzo <rizzo@icir.org>2006-04-14 14:08:19 +0000
committerLuigi Rizzo <rizzo@icir.org>2006-04-14 14:08:19 +0000
commite43bc6634dc60ca897a848ca3301f52c74330279 (patch)
treeb68f48482e463e9c31126b2e3e24fca1dd2f6c82 /apps/app_dictate.c
parent33a3a7375a4917455495c08c8602bfe453580fd1 (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 'apps/app_dictate.c')
-rw-r--r--apps/app_dictate.c24
1 files changed, 7 insertions, 17 deletions
diff --git a/apps/app_dictate.c b/apps/app_dictate.c
index 871fc5a33..95f814096 100644
--- a/apps/app_dictate.c
+++ b/apps/app_dictate.c
@@ -46,7 +46,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/lock.h"
#include "asterisk/app.h"
-static char *tdesc = "Virtual Dictation Machine";
static char *app = "Dictate";
static char *synopsis = "Virtual Dictation Machine";
static char *desc = " Dictate([<base_dir>[|<filename>]])\n"
@@ -336,36 +335,27 @@ static int dictate_exec(struct ast_channel *chan, void *data)
return res;
}
-int unload_module(void)
+static int unload_module(void *mod)
{
int res;
-
res = ast_unregister_application(app);
-
- STANDARD_HANGUP_LOCALUSERS;
-
return res;
}
-int load_module(void)
+static int load_module(void *mod)
{
+ __mod_desc = mod;
return ast_register_application(app, dictate_exec, synopsis, desc);
}
-const char *description(void)
-{
- return tdesc;
-}
-
-int usecount(void)
+static const char *description(void)
{
- int res;
- STANDARD_USECOUNT(res);
- return res;
+ return "Virtual Dictation Machine";
}
-const char *key()
+static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
+STD_MOD(MOD_1, NULL, NULL, NULL);