From 1fd898bd848f1e6f876fe0c64d04a75f3ab24d76 Mon Sep 17 00:00:00 2001 From: Luigi Rizzo Date: Thu, 6 Apr 2006 09:24:02 +0000 Subject: convert a couple of applications to the new module style (STATIC_MODULE) to show what needs to be changed. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@17791 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_dial.c | 13 ++++++++----- apps/app_record.c | 14 +++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/apps/app_dial.c b/apps/app_dial.c index 921ee46a0..198790879 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -35,6 +35,7 @@ #include #include +#define STATIC_MODULE #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -1719,7 +1720,7 @@ static int retrydial_exec(struct ast_channel *chan, void *data) } -int unload_module(void) +STATIC_MODULE int unload_module(void) { int res; @@ -1731,7 +1732,7 @@ int unload_module(void) return res; } -int load_module(void) +STATIC_MODULE int load_module(void) { int res; @@ -1741,19 +1742,21 @@ int load_module(void) return res; } -char *description(void) +STATIC_MODULE char *description(void) { return tdesc; } -int usecount(void) +STATIC_MODULE int usecount(void) { int res; STANDARD_USECOUNT(res); return res; } -char *key() +STATIC_MODULE char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); diff --git a/apps/app_record.c b/apps/app_record.c index 07167278c..ddf94a9eb 100644 --- a/apps/app_record.c +++ b/apps/app_record.c @@ -29,6 +29,8 @@ #include #include +#define STATIC_MODULE + #include "asterisk.h" ASTERISK_FILE_VERSION(__FILE__, "$Revision$") @@ -341,7 +343,7 @@ static int record_exec(struct ast_channel *chan, void *data) return res; } -int unload_module(void) +STATIC_MODULE int unload_module(void) { int res; @@ -352,24 +354,26 @@ int unload_module(void) return res; } -int load_module(void) +STATIC_MODULE int load_module(void) { return ast_register_application(app, record_exec, synopsis, descrip); } -char *description(void) +STATIC_MODULE char *description(void) { return tdesc; } -int usecount(void) +STATIC_MODULE int usecount(void) { int res; STANDARD_USECOUNT(res); return res; } -char *key() +STATIC_MODULE char *key(void) { return ASTERISK_GPL_KEY; } + +STD_MOD(MOD_1, NULL, NULL, NULL); -- cgit v1.2.3