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_setcallerid.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_setcallerid.c')
-rw-r--r-- | apps/app_setcallerid.c | 37 |
1 files changed, 11 insertions, 26 deletions
diff --git a/apps/app_setcallerid.c b/apps/app_setcallerid.c index b8b079a39..4456e1ee0 100644 --- a/apps/app_setcallerid.c +++ b/apps/app_setcallerid.c @@ -47,7 +47,6 @@ static char *app2 = "SetCallerPres"; static char *synopsis2 = "Set CallerID Presentation"; -LOCAL_USER_DECL; static char *descrip2 = " SetCallerPres(presentation): Set Caller*ID presentation on a call.\n" @@ -67,29 +66,25 @@ static char *descrip2 = static int setcallerid_pres_exec(struct ast_channel *chan, void *data) { - struct localuser *u; + struct ast_module_user *u; int pres = -1; - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); pres = ast_parse_caller_presentation(data); if (pres < 0) { ast_log(LOG_WARNING, "'%s' is not a valid presentation (see 'show application SetCallerPres')\n", (char *) data); - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return 0; } chan->cid.cid_pres = pres; - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return 0; } - - -static char *tdesc = "Set CallerID Application"; - static char *app = "SetCallerID"; static char *synopsis = "Set CallerID"; @@ -104,7 +99,7 @@ static int setcallerid_exec(struct ast_channel *chan, void *data) char *tmp = NULL; char name[256]; char num[256]; - struct localuser *u; + struct ast_module_user *u; char *opt; int anitoo = 0; static int dep_warning = 0; @@ -114,7 +109,7 @@ static int setcallerid_exec(struct ast_channel *chan, void *data) return 0; } - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); if (!dep_warning) { dep_warning = 1; @@ -134,24 +129,24 @@ static int setcallerid_exec(struct ast_channel *chan, void *data) ast_callerid_split(tmp, name, sizeof(name), num, sizeof(num)); ast_set_callerid(chan, num, name, anitoo ? num : NULL); - 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(app2); res |= ast_unregister_application(app); - STANDARD_HANGUP_LOCALUSERS; + ast_module_user_hangup_all(); return res; } -static int load_module(void *mod) +static int load_module(void) { int res; @@ -161,14 +156,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, "Set CallerID Application"); |