summaryrefslogtreecommitdiff
path: root/channels/chan_oss.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 /channels/chan_oss.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 'channels/chan_oss.c')
-rw-r--r--channels/chan_oss.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/channels/chan_oss.c b/channels/chan_oss.c
index 140ed21bd..8ee16dc33 100644
--- a/channels/chan_oss.c
+++ b/channels/chan_oss.c
@@ -1462,7 +1462,7 @@ error:
return NULL;
}
-int load_module(void)
+static int load_module(void *mod)
{
int i;
struct ast_config *cfg;
@@ -1497,7 +1497,7 @@ int load_module(void)
}
-int unload_module()
+static int unload_module(void *mod)
{
struct chan_oss_pvt *o;
@@ -1521,17 +1521,14 @@ int unload_module()
return 0;
}
-const char *description()
+static const char *description(void)
{
return (char *)oss_tech.description;
}
-int usecount()
-{
- return usecnt;
-}
-
-const char *key()
+static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
+
+STD_MOD(MOD_1, NULL, NULL, NULL);