[svn-commits] seanbright: branch 1.6.2 r222547 - /branches/1.6.2/funcs/func_strings.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Oct  7 13:00:03 2009
New Revision: 222547

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=222547
Log:
Fix merge error.

Modified:
    branches/1.6.2/funcs/func_strings.c

Modified: branches/1.6.2/funcs/func_strings.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/funcs/func_strings.c?view=diff&rev=222547&r1=222546&r2=222547
==============================================================================
--- branches/1.6.2/funcs/func_strings.c (original)
+++ branches/1.6.2/funcs/func_strings.c Wed Oct  7 13:00:03 2009
@@ -276,8 +276,6 @@
 			<para>Example: ${QUOTE(ab"c"de)} will return "abcde"</para>
 		</description>
 	</function>
-<<<<<<< .working
-=======
 	<function name="CSV_QUOTE" language="en_US">
 		<synopsis>
 			Quotes a given string for use in a CSV file, escaping embedded quotes as necessary
@@ -289,77 +287,6 @@
 			<para>Example: ${CSV_QUOTE("a,b" 123)} will return """a,b"" 123"</para>
 		</description>
 	</function>
-	<function name="SHIFT" language="en_US">
-		<synopsis>
-			Removes and returns the first item off of a variable containing delimited text
-		</synopsis>
-		<syntax>
-			<parameter name="varname" required="true" />
-			<parameter name="delimiter" required="false" default="," />
-		</syntax>
-		<description>
-			<para>Example:</para>
-			<para>exten => s,1,Set(array=one,two,three)</para>
-			<para>exten => s,n,While($["${SET(var=${SHIFT(array)})}" != ""])</para>
-			<para>exten => s,n,NoOp(var is ${var})</para>
-			<para>exten => s,n,EndWhile</para>
-			<para>This would iterate over each value in array, left to right, and
-				would result in NoOp(var is one), NoOp(var is two), and
-				NoOp(var is three) being executed.
-			</para>
-		</description>
-	</function>	
-	<function name="POP" language="en_US">
-		<synopsis>
-			Removes and returns the last item off of a variable containing delimited text
-		</synopsis>
-		<syntax>
-			<parameter name="varname" required="true" />
-			<parameter name="delimiter" required="false" default="," />
-		</syntax>
-		<description>
-			<para>Example:</para>
-			<para>exten => s,1,Set(array=one,two,three)</para>
-			<para>exten => s,n,While($["${SET(var=${POP(array)})}" != ""])</para>
-			<para>exten => s,n,NoOp(var is ${var})</para>
-			<para>exten => s,n,EndWhile</para>
-			<para>This would iterate over each value in array, right to left, and
-				would result in NoOp(var is three), NoOp(var is two), and
-				NoOp(var is one) being executed.
-			</para>
-		</description>
-	</function>	
-	<function name="PUSH" language="en_US">
-		<synopsis>
-			Appends one or more values to the end of a variable containing delimited text
-		</synopsis>
-		<syntax>
-			<parameter name="varname" required="true" />
-			<parameter name="delimiter" required="false" default="," />
-		</syntax>
-		<description>
-			<para>Example: Set(PUSH(array)=one,two,three) would append one,
-				two, and three to the end of the values stored in the variable
-				"array".
-			</para>
-		</description>
-	</function>
-	<function name="UNSHIFT" language="en_US">
-		<synopsis>
-			Inserts one or more values to the beginning of a variable containing delimited text
-		</synopsis>
-		<syntax>
-			<parameter name="varname" required="true" />
-			<parameter name="delimiter" required="false" default="," />
-		</syntax>
-		<description>
-			<para>Example: Set(UNSHIFT(array)=one,two,three) would insert one,
-				two, and three before the values stored in the variable
-				"array".
-			</para>
-		</description>
-	</function>
->>>>>>> .merge-right.r221368
  ***/
 
 static int function_fieldqty(struct ast_channel *chan, const char *cmd,