diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-07 18:00:03 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-07 18:00:03 +0000 |
| commit | 436a0e08a2c2d5d50c284b2c1a4e779309a49c97 (patch) | |
| tree | 914185ea41787bf40f1f83d849cc88912f2d1839 /funcs | |
| parent | a3930904186edb70ffe4e6c9028e9a7594c9bc92 (diff) | |
Fix merge error.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@222547 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_strings.c | 73 |
1 files changed, 0 insertions, 73 deletions
diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 4df364d32..fe5b40f5d 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -276,8 +276,6 @@ AST_THREADSTORAGE(result_buf); <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 @@ AST_THREADSTORAGE(result_buf); <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, |