diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-08-01 02:26:53 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-08-01 02:26:53 +0000 |
| commit | ee0d991102caad64ed151f0ae8ffe7f6ad64cf78 (patch) | |
| tree | cd2dfed1a0898863ed7482ba837aa52f2012f63c /utils | |
| parent | 4377d511ae88dded48929292042f45a8831d4120 (diff) | |
Revert alloca changes for utils
These changes were a tad overzealous in the utils directory.
Unfortunately, these don't compile with a "make".
........
Merged revisions 370697 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 370698 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@370699 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/extconf.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/utils/extconf.c b/utils/extconf.c index 7e08aefaf..8245a161f 100644 --- a/utils/extconf.c +++ b/utils/extconf.c @@ -5812,7 +5812,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v whereweare += (len + 3); if (!var) - var = ast_alloca(VAR_BUF_SIZE); + var = alloca(VAR_BUF_SIZE); /* Store variable name (and truncate) */ ast_copy_string(var, vars, len + 1); @@ -5820,7 +5820,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v /* Substitute if necessary */ if (needsub) { if (!ltmp) - ltmp = ast_alloca(VAR_BUF_SIZE); + ltmp = alloca(VAR_BUF_SIZE); memset(ltmp, 0, VAR_BUF_SIZE); pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1); @@ -5830,7 +5830,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v } if (!workspace) - workspace = ast_alloca(VAR_BUF_SIZE); + workspace = alloca(VAR_BUF_SIZE); workspace[0] = '\0'; @@ -5887,7 +5887,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v whereweare += (len + 3); if (!var) - var = ast_alloca(VAR_BUF_SIZE); + var = alloca(VAR_BUF_SIZE); /* Store variable name (and truncate) */ ast_copy_string(var, vars, len + 1); @@ -5895,7 +5895,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v /* Substitute if necessary */ if (needsub) { if (!ltmp) - ltmp = ast_alloca(VAR_BUF_SIZE); + ltmp = alloca(VAR_BUF_SIZE); memset(ltmp, 0, VAR_BUF_SIZE); pbx_substitute_variables_helper_full(c, headp, var, ltmp, VAR_BUF_SIZE - 1); |