kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor code and stack space optimizations

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-09-26 16:58:40 +00:00
parent 852bf07caa
commit f68285950b
1 changed files with 47 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
pbx.c
View File

@@ -75,6 +75,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#define SWITCH_DATA_LENGTH 256 #define SWITCH_DATA_LENGTH 256
#define VAR_BUF_SIZE 4096
#define VAR_NORMAL 1 #define VAR_NORMAL 1
#define VAR_SOFTTRAN 2 #define VAR_SOFTTRAN 2
@@ -1381,13 +1382,13 @@ void ast_func_write(struct ast_channel *chan, const char *in, const char *value)
} }
} }
static void pbx_substitute_variables_helper_full(struct ast_channel *c, const char *cp1, char *cp2, int count, struct varshead *headp) static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct varshead *headp, const char *cp1, char *cp2, int count)
{ {
char *cp4; char *cp4;
const char *tmp, *whereweare; const char *tmp, *whereweare;
int length; int length;
char workspace[4096]; char *workspace;
char ltmp[4096], var[4096]; char *ltmp, *var;
char *nextvar, *nextexp, *nextthing; char *nextvar, *nextexp, *nextthing;
char *vars, *vare; char *vars, *vare;
int pos, brackets, needsub, len; int pos, brackets, needsub, len;
@@ -1405,28 +1406,27 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, const ch
switch(nextthing[1]) { switch(nextthing[1]) {
case '{': case '{':
nextvar = nextthing; nextvar = nextthing;
pos = nextvar - whereweare;
break; break;
case '[': case '[':
nextexp = nextthing; nextexp = nextthing;
pos = nextexp - whereweare;
break; break;
} }
} }
/* If there is one, we only go that far */
if (nextvar)
pos = nextvar - whereweare;
else if (nextexp)
pos = nextexp - whereweare;
/* Can't copy more than 'count' bytes */ if (pos) {
if (pos > count) /* Can't copy more than 'count' bytes */
pos = count; if (pos > count)
pos = count;
/* Copy that many bytes */ /* Copy that many bytes */
memcpy(cp2, whereweare, pos); memcpy(cp2, whereweare, pos);
count -= pos; count -= pos;
cp2 += pos; cp2 += pos;
whereweare += pos; whereweare += pos;
}
if (nextvar) { if (nextvar) {
/* We have a variable. Find the start and end, and determine /* We have a variable. Find the start and end, and determine
@@ -1451,33 +1451,40 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, const ch
ast_log(LOG_NOTICE, "Error in extension logic (missing '}')\n"); ast_log(LOG_NOTICE, "Error in extension logic (missing '}')\n");
len = vare - vars - 1; len = vare - vars - 1;
/* Skip totally over variable name */ /* Skip totally over variable string */
whereweare += (len + 3); whereweare += (len + 3);
if (!var)
var = alloca(VAR_BUF_SIZE);
/* Store variable name (and truncate) */ /* Store variable name (and truncate) */
memset(var, 0, sizeof(var)); ast_copy_string(var, vars, len + 1);
ast_copy_string(var, vars, sizeof(var));
var[len] = '\0';
/* Substitute if necessary */ /* Substitute if necessary */
if (needsub) { if (needsub) {
memset(ltmp, 0, sizeof(ltmp)); if (!ltmp)
pbx_substitute_variables_helper(c, var, ltmp, sizeof(ltmp) - 1); ltmp = alloca(VAR_BUF_SIZE);
memset(ltmp, 0, VAR_BUF_SIZE);
pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1);
vars = ltmp; vars = ltmp;
} else { } else {
vars = var; vars = var;
} }
if (!workspace)
workspace = alloca(VAR_BUF_SIZE);
workspace[0] = '\0'; workspace[0] = '\0';
if (var[len - 1] == ')') { if (var[len - 1] == ')') {
/* Evaluate function */ /* Evaluate function */
cp4 = ast_func_read(c, vars, workspace, sizeof(workspace)); cp4 = ast_func_read(c, vars, workspace, VAR_BUF_SIZE);
ast_log(LOG_DEBUG, "Function result is '%s'\n", cp4 ? cp4 : "(null)"); ast_log(LOG_DEBUG, "Function result is '%s'\n", cp4 ? cp4 : "(null)");
} else { } else {
/* Retrieve variable value */ /* Retrieve variable value */
pbx_retrieve_variable(c, vars, &cp4, workspace, sizeof(workspace), headp); pbx_retrieve_variable(c, vars, &cp4, workspace, VAR_BUF_SIZE, headp);
} }
if (cp4) { if (cp4) {
length = strlen(cp4); length = strlen(cp4);
@@ -1515,18 +1522,22 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, const ch
ast_log(LOG_NOTICE, "Error in extension logic (missing ']')\n"); ast_log(LOG_NOTICE, "Error in extension logic (missing ']')\n");
len = vare - vars - 1; len = vare - vars - 1;
/* Skip totally over variable name */ /* Skip totally over expression */
whereweare += ( len + 3); whereweare += (len + 3);
if (!var)
var = alloca(VAR_BUF_SIZE);
/* Store variable name (and truncate) */ /* Store variable name (and truncate) */
memset(var, 0, sizeof(var)); ast_copy_string(var, vars, len + 1);
ast_copy_string(var, vars, sizeof(var));
var[len] = '\0';
/* Substitute if necessary */ /* Substitute if necessary */
if (needsub) { if (needsub) {
memset(ltmp, 0, sizeof(ltmp)); if (!ltmp)
pbx_substitute_variables_helper(c, var, ltmp, sizeof(ltmp) - 1); ltmp = alloca(VAR_BUF_SIZE);
memset(ltmp, 0, VAR_BUF_SIZE);
pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1);
vars = ltmp; vars = ltmp;
} else { } else {
vars = var; vars = var;
@@ -1546,12 +1557,12 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, const ch
void pbx_substitute_variables_helper(struct ast_channel *c, const char *cp1, char *cp2, int count) void pbx_substitute_variables_helper(struct ast_channel *c, const char *cp1, char *cp2, int count)
{ {
pbx_substitute_variables_helper_full(c, cp1, cp2, count, NULL); pbx_substitute_variables_helper_full(c, &c->varshead, cp1, cp2, count);
} }
void pbx_substitute_variables_varshead(struct varshead *headp, const char *cp1, char *cp2, int count) void pbx_substitute_variables_varshead(struct varshead *headp, const char *cp1, char *cp2, int count)
{ {
pbx_substitute_variables_helper_full(NULL, cp1, cp2, count, headp); pbx_substitute_variables_helper_full(NULL, headp, cp1, cp2, count);
} }
static void pbx_substitute_variables(char *passdata, int datalen, struct ast_channel *c, struct ast_exten *e) static void pbx_substitute_variables(char *passdata, int datalen, struct ast_channel *c, struct ast_exten *e)
@@ -5900,7 +5911,7 @@ int pbx_builtin_importvar(struct ast_channel *chan, void *data)
char *stringp=NULL; char *stringp=NULL;
char *channel; char *channel;
struct ast_channel *chan2; struct ast_channel *chan2;
char tmp[4096]=""; char tmp[VAR_BUF_SIZE]="";
char *s; char *s;
if (!data || ast_strlen_zero(data)) { if (!data || ast_strlen_zero(data)) {