From ee0d991102caad64ed151f0ae8ffe7f6ad64cf78 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Wed, 1 Aug 2012 02:26:53 +0000 Subject: 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 --- utils/extconf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'utils/extconf.c') 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); -- cgit v1.2.3