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_readfile.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_readfile.c')
-rw-r--r-- | apps/app_readfile.c | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/apps/app_readfile.c b/apps/app_readfile.c index 8c5c4b1b5..7e43a3806 100644 --- a/apps/app_readfile.c +++ b/apps/app_readfile.c @@ -42,8 +42,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/app.h" #include "asterisk/module.h" -static char *tdesc = "Stores output of file into a variable"; - static char *app_readfile = "ReadFile"; static char *readfile_synopsis = "ReadFile(varname=file,length)"; @@ -54,12 +52,11 @@ static char *readfile_descrip = " File - The name of the file to read.\n" " Length - Maximum number of characters to capture.\n"; -LOCAL_USER_DECL; static int readfile_exec(struct ast_channel *chan, void *data) { int res=0; - struct localuser *u; + struct ast_module_user *u; char *s, *varname=NULL, *file=NULL, *length=NULL, *returnvar=NULL; int len=0; @@ -68,7 +65,7 @@ static int readfile_exec(struct ast_channel *chan, void *data) return -1; } - LOCAL_USER_ADD(u); + u = ast_module_user_add(chan); s = ast_strdupa(data); @@ -78,7 +75,7 @@ static int readfile_exec(struct ast_channel *chan, void *data) if (!varname || !file) { ast_log(LOG_ERROR, "No file or variable specified!\n"); - LOCAL_USER_REMOVE(u); + ast_module_user_remove(u); return -1; } @@ -99,35 +96,25 @@ static int readfile_exec(struct ast_channel *chan, void *data) pbx_builtin_setvar_helper(chan, varname, returnvar); free(returnvar); } - 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_readfile); - STANDARD_HANGUP_LOCALUSERS; + ast_module_user_hangup_all(); return res; } -static int load_module(void *mod) +static int load_module(void) { return ast_register_application(app_readfile, readfile_exec, readfile_synopsis, readfile_descrip); } -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, "Stores output of file into a variable"); |