[asterisk-commits] kmoore: trunk r370699 - in /trunk: ./ utils/extconf.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Tue Jul 31 21:26:53 2012
New Revision: 370699

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=370699
Log:
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

Modified:
    trunk/   (props changed)
    trunk/utils/extconf.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/utils/extconf.c
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/extconf.c?view=diff&rev=370699&r1=370698&r2=370699
==============================================================================
--- trunk/utils/extconf.c (original)
+++ trunk/utils/extconf.c Tue Jul 31 21:26:53 2012
@@ -5812,7 +5812,7 @@
 			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 @@
 			/* 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 @@
 			}
 
 			if (!workspace)
-				workspace = ast_alloca(VAR_BUF_SIZE);
+				workspace = alloca(VAR_BUF_SIZE);
 
 			workspace[0] = '\0';
 
@@ -5887,7 +5887,7 @@
 			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 @@
 			/* 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);