kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

For my next trick I will make it so dialplan functions no longer need to call ast_module_user_add and ast_module_user_remove. These are now called in the ast_func_read and ast_func_write functions outside of the module.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-07-16 18:24:29 +00:00
parent ce8f95d750
commit e498488bde
9 changed files with 33 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
funcs/func_enum.c
View File

@@ -67,7 +67,6 @@ static int function_enum(struct ast_channel *chan, const char *cmd, char *data,
int res = 0;
char tech[80];
char dest[256] = "", tmp[2] = "", num[AST_MAX_EXTENSION] = "";
struct ast_module_user *u;
char *s, *p;
unsigned int record = 1;
@@ -85,8 +84,6 @@ static int function_enum(struct ast_channel *chan, const char *cmd, char *data,
return -1;
}
u = ast_module_user_add(chan);
ast_copy_string(tech, args.tech ? args.tech : "sip", sizeof(tech));
if (!args.zone)
@@ -115,8 +112,6 @@ static int function_enum(struct ast_channel *chan, const char *cmd, char *data,
else
ast_copy_string(buf, dest, len);
ast_module_user_remove(u);
return 0;
}
@@ -156,7 +151,6 @@ static int enum_query_read(struct ast_channel *chan, const char *cmd, char *data
{
struct enum_result_datastore *erds;
struct ast_datastore *datastore;
struct ast_module_user *u;
char *parse, tech[128], dest[128];
int res = -1;
@@ -166,8 +160,6 @@ static int enum_query_read(struct ast_channel *chan, const char *cmd, char *data
AST_APP_ARG(zone);
);
u = ast_module_user_add(chan);
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "ENUMQUERY requires at least a number as an argument...\n");
goto finish;
@@ -214,14 +206,12 @@ static int enum_query_read(struct ast_channel *chan, const char *cmd, char *data
res = 0;
finish:
ast_module_user_remove(u);
return res;
}
static int enum_result_read(struct ast_channel *chan, const char *cmd, char *data, char *buf, size_t len)
{
struct ast_module_user *u;
struct enum_result_datastore *erds;
struct ast_datastore *datastore;
char *parse, *p;
@@ -232,8 +222,6 @@ static int enum_result_read(struct ast_channel *chan, const char *cmd, char *dat
AST_APP_ARG(resultnum);
);
u = ast_module_user_add(chan);
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "ENUMRESULT requires two arguments (id and resultnum)\n");
goto finish;
@@ -298,7 +286,6 @@ static int enum_result_read(struct ast_channel *chan, const char *cmd, char *dat
res = 0;
finish:
ast_module_user_remove(u);
return res;
}
@@ -349,7 +336,6 @@ static int function_txtcidname(struct ast_channel *chan, const char *cmd,
char tech[80];
char txt[256] = "";
char dest[80];
struct ast_module_user *u;
buf[0] = '\0';
@@ -359,16 +345,12 @@ static int function_txtcidname(struct ast_channel *chan, const char *cmd,
return -1;
}
u = ast_module_user_add(chan);
res = ast_get_txt(chan, data, dest, sizeof(dest), tech, sizeof(tech), txt,
sizeof(txt));
if (!ast_strlen_zero(txt))
ast_copy_string(buf, txt, len);
ast_module_user_remove(u);
return 0;
}