aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_voicemail.c
diff options
context:
space:
mode:
authorrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-14 14:08:19 +0000
committerrizzo <rizzo@f38db490-d61c-443f-a65b-d21fe96a405b>2006-04-14 14:08:19 +0000
commit3664249356aa4768fcb0b3b8e6cf9365fcbd0c8d (patch)
treeb68f48482e463e9c31126b2e3e24fca1dd2f6c82 /apps/app_voicemail.c
parentf9d382fc079246930a99640d7835d6ae3e4149db (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 'apps/app_voicemail.c')
-rw-r--r--apps/app_voicemail.c23
1 files changed, 8 insertions, 15 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ae061de3c..d64c4963e 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6389,12 +6389,12 @@ static int load_config(void)
}
}
-int reload(void)
+static int reload(void *mod)
{
return(load_config());
}
-int unload_module(void)
+static int unload_module(void *mod)
{
int res;
@@ -6411,7 +6411,7 @@ int unload_module(void)
return res;
}
-int load_module(void)
+static int load_module(void *mod)
{
int res;
res = ast_register_application(app, vm_exec, synopsis_vm, descrip_vm);
@@ -6443,11 +6443,6 @@ int load_module(void)
return res;
}
-const char *description(void)
-{
- return tdesc;
-}
-
static int dialout(struct ast_channel *chan, struct ast_vm_user *vmu, char *num, char *outgoing_context)
{
int cmd = 0;
@@ -6860,18 +6855,16 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
if (cmd == 't')
cmd = 0;
return cmd;
- }
+}
-
-int usecount(void)
+static const char *description(void)
{
- int res;
- STANDARD_USECOUNT(res);
- return res;
+ return tdesc;
}
-const char *key()
+static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
+STD_MOD(MOD_1, reload, NULL, NULL);