Author: anthm Date: Sun Nov 19 21:01:21 2006 New Revision: 3418 Modified: freeswitch/trunk/src/switch_channel.c Log: ampersand was being used to indicate a function and a double call change it to carrot ^ for functions Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Sun Nov 19 21:01:21 2006 @@ -1117,7 +1117,7 @@ size_t sp = 0, len = 0, olen = 0, vtype = 0, br = 0, cpos, block = 128; char *sub_val = NULL, *func_val = NULL; - if (!strchr(in, '$') && !strchr(in, '&')) { + if (!strchr(in, '$') && !strchr(in, '^')) { return in; } @@ -1133,7 +1133,7 @@ if (*p == '$') { vtype = 1; } - if (*p == '&') { + if (*p == '^') { vtype = 2; } @@ -1141,7 +1141,7 @@ char *s = p, *e, *vname, *vval = NULL; size_t nlen; s++; - if (*s == '{') { + if (vtype == 1 && *s == '{') { br = 1; s++; } @@ -1219,7 +1219,7 @@ len++; } - if (*p == '$' || *p == '&') { + if (*p == '$' || *p == '^') { p--; } else { *c++ = *p;