diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
| commit | 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch) | |
| tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /res/res_jabber.c | |
| parent | f60ada0be22cd646454278e102d384a5dbaf7d59 (diff) | |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res/res_jabber.c')
| -rw-r--r-- | res/res_jabber.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c index 65064170e..ed6d37321 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -120,8 +120,6 @@ static struct ast_cli_entry aji_cli[] = { {{ "jabber", "test", NULL}, aji_test, "Shows roster, but is genearlly used for mog's debugging.", test_usage }, }; -static const char *tdesc = "AJI - Asterisk Jabber Interface"; - static char *app_ajisend = "JabberSend"; static char *ajisend_synopsis = "JabberSend(jabber,screenname,message)"; @@ -2284,7 +2282,7 @@ static void aji_reload() } } -static int unload_module(void *mod) +static int unload_module(void) { ast_cli_unregister_multiple(aji_cli, sizeof(aji_cli) / sizeof(aji_cli[0])); ast_unregister_application(app_ajisend); @@ -2306,7 +2304,7 @@ static int unload_module(void *mod) return 0; } -static int load_module(void *mod) +static int load_module(void) { ASTOBJ_CONTAINER_INIT(&clients); aji_reload(); @@ -2320,20 +2318,14 @@ static int load_module(void *mod) return 0; } -static int reload(void *mod) +static int reload(void) { aji_reload(); return 0; } -static const char *description(void) -{ - return tdesc; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD(MOD_0, reload, NULL, NULL); +AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "AJI - Asterisk Jabber Interface", + .load = load_module, + .unload = unload_module, + .reload = reload, + ); |