summaryrefslogtreecommitdiff
path: root/pbx/pbx_spool.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 /pbx/pbx_spool.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 'pbx/pbx_spool.c')
-rw-r--r--pbx/pbx_spool.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 122b2e5aa..e7136aa44 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
* The spool file contains a header
*/
-static char *tdesc = "Outgoing Spool Support";
static char qdir[255];
struct outgoing {
@@ -404,12 +403,12 @@ static void *scan_thread(void *unused)
return NULL;
}
-int unload_module(void)
+static int unload_module(void *mod)
{
return -1;
}
-int load_module(void)
+static int load_module(void *mod)
{
pthread_t thread;
pthread_attr_t attr;
@@ -428,17 +427,14 @@ int load_module(void)
return 0;
}
-const char *description(void)
+static const char *description(void)
{
- return tdesc;
+ return "Outgoing Spool Support";
}
-int usecount(void)
-{
- return 1;
-}
-
-const char *key()
+static const char *key(void)
{
return ASTERISK_GPL_KEY;
}
+
+STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL);