kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-17 07:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@222547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-10-07 18:00:03 +00:00
parent 1409dd6481
commit 8c6f79adec
1 changed files with 0 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
funcs/func_strings.c
View File

@@ -276,8 +276,6 @@ AST_THREADSTORAGE(result_buf);
<para>Example: ${QUOTE(ab"c"de)} will return "abcde"</para> <para>Example: ${QUOTE(ab"c"de)} will return "abcde"</para>
</description> </description>
</function> </function>
<<<<<<< .working
=======
<function name="CSV_QUOTE" language="en_US"> <function name="CSV_QUOTE" language="en_US">
<synopsis> <synopsis>
Quotes a given string for use in a CSV file, escaping embedded quotes as necessary Quotes a given string for use in a CSV file, escaping embedded quotes as necessary
@@ -289,77 +287,6 @@ AST_THREADSTORAGE(result_buf);
<para>Example: ${CSV_QUOTE("a,b" 123)} will return """a,b"" 123"</para> <para>Example: ${CSV_QUOTE("a,b" 123)} will return """a,b"" 123"</para>
</description> </description>
</function> </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, static int function_fieldqty(struct ast_channel *chan, const char *cmd,