[asterisk-commits] murf: trunk r77218 - in /trunk: ./ pbx/pbx_ael.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Jul 25 20:33:55 2007
New Revision: 77218

URL: http://svn.digium.com/view/asterisk?view=rev&rev=77218
Log:
The upgrade of application argument separators to comma has an effect on AEL; I commented out the code that substitutes commas with vertbars, so we can get apps to parse their args correctly.

Modified:
    trunk/   (props changed)
    trunk/pbx/pbx_ael.c

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

Modified: trunk/pbx/pbx_ael.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_ael.c?view=diff&rev=77218&r1=77217&r2=77218
==============================================================================
--- trunk/pbx/pbx_ael.c (original)
+++ trunk/pbx/pbx_ael.c Wed Jul 25 20:33:55 2007
@@ -149,8 +149,8 @@
 static pval *get_extension_or_contxt(pval *p);
 static pval *get_contxt(pval *p);
 static void remove_spaces_before_equals(char *str);
-static void substitute_commas(char *str);
-
+/* static void substitute_commas(char *str); */
+#ifdef NOMORE
 /*! \brief I am adding this code to substitute commas with vertbars in the args to apps */
 static void substitute_commas(char *str)
 {
@@ -171,7 +171,7 @@
 		p++;
 	}
 }
-
+#endif
 
 /* PRETTY PRINTER FOR AEL:  ============================================================================= */
 
@@ -3474,7 +3474,7 @@
 					first = 0;
 				}
 				else
-					strcat(buf1,"|");
+					strcat(buf1,",");
 				strcat(buf1,p2->u1.str);
 			}
 			if (!first)
@@ -3492,8 +3492,8 @@
 			buf1[0] = 0;
 			for (p2 = p->u2.arglist; p2; p2 = p2->next) {
 				if (p2 != p->u2.arglist )
-					strcat(buf1,"|");
-				substitute_commas(p2->u1.str);
+					strcat(buf1,",");
+				/*substitute_commas(p2->u1.str); */
 				strcat(buf1,p2->u1.str);
 			}
 			pr->app = strdup(p->u1.str);