diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-21 02:11:39 +0000 |
commit | 8b0c007ad990aa27d9868da49215fd1076ac77cc (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /apps/app_sayunixtime.c | |
parent | a42edc84034f91932a3e12d503e07f76a6eb498a (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: http://svn.digium.com/svn/asterisk/trunk@40722 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_sayunixtime.c')
-rw-r--r-- | apps/app_sayunixtime.c | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/apps/app_sayunixtime.c b/apps/app_sayunixtime.c index 31b69f9f9..2e9c9b323 100644 --- a/apps/app_sayunixtime.c +++ b/apps/app_sayunixtime.c @@ -43,8 +43,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/say.h" #include "asterisk/app.h" -static char *tdesc = "Say time"; - static char *app_sayunixtime = "SayUnixTime"; static char *app_datetime = "DateTime"; @@ -67,7 +65,6 @@ static char *datetime_descrip = " format: a format the time is to be said in. See voicemail.conf.\n" " defaults to \"ABdY 'digits/at' IMp\"\n"; -LOCAL_USER_DECL; static int sayunixtime_exec(struct ast_channel *chan, void *data) { @@ -78,7 +75,7 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data) ); char *parse; int res = 0; - struct localuser *u; + struct ast_module_user *u; time_t unixtime; if (!data) @@ -86,7 +83,7 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data) parse = ast_strdupa(data); - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); AST_STANDARD_APP_ARGS(args, parse); @@ -99,24 +96,24 @@ static int sayunixtime_exec(struct ast_channel *chan, void *data) res = ast_say_date_with_format(chan, unixtime, AST_DIGIT_ANY, chan->language, args.format, args.timezone); - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return res; } -static int unload_module(void *mod) +static int unload_module(void) { int res; res = ast_unregister_application(app_sayunixtime); res |= ast_unregister_application(app_datetime); - STANDARD_HANGUP_LOCALUSERS; + ast_module_user_hangup_all(); return res; } -static int load_module(void *mod) +static int load_module(void) { int res; @@ -126,14 +123,4 @@ static int load_module(void *mod) return res; } -static const char *description(void) -{ - return tdesc; -} - -static const char *key(void) -{ - return ASTERISK_GPL_KEY; -} - -STD_MOD1; +AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Say time"); |