bjori Mon Jun 26 18:48:56 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard array.c formatted_print.c levenshtein.c
metaphone.c streamsfuncs.c string.c url.c
uuencode.c versioning.c
Log:
Updated protos & vim folding
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.308.2.21.2.1&r2=1.308.2.21.2.2&diff_format=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.308.2.21.2.1
php-src/ext/standard/array.c:1.308.2.21.2.2
--- php-src/ext/standard/array.c:1.308.2.21.2.1 Sat Jun 3 18:56:44 2006
+++ php-src/ext/standard/array.c Mon Jun 26 18:48:56 2006
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.308.2.21.2.1 2006/06/03 18:56:44 andrei Exp $ */
+/* $Id: array.c,v 1.308.2.21.2.2 2006/06/26 18:48:56 bjori Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -224,7 +224,7 @@
return array_key_compare(a, b TSRMLS_CC) * -1;
}
-/* {{{ proto bool krsort(array array_arg [, int sort_flags])
+/* {{{ proto bool krsort(array &array_arg [, int sort_flags])
Sort an array by key value in reverse order */
PHP_FUNCTION(krsort)
{
@@ -246,7 +246,7 @@
}
/* }}} */
-/* {{{ proto bool ksort(array array_arg [, int sort_flags])
+/* {{{ proto bool ksort(array &array_arg [, int sort_flags])
Sort an array by key */
PHP_FUNCTION(ksort)
{
@@ -459,7 +459,7 @@
}
-/* {{{ proto void natsort(array array_arg)
+/* {{{ proto void natsort(array &array_arg)
Sort an array using natural sort */
PHP_FUNCTION(natsort)
{
@@ -468,7 +468,7 @@
/* }}} */
-/* {{{ proto void natcasesort(array array_arg)
+/* {{{ proto void natcasesort(array &array_arg)
Sort an array using case-insensitive natural sort */
PHP_FUNCTION(natcasesort)
{
@@ -477,7 +477,7 @@
/* }}} */
-/* {{{ proto bool asort(array array_arg [, int sort_flags])
+/* {{{ proto bool asort(array &array_arg [, int sort_flags])
Sort an array and maintain index association */
PHP_FUNCTION(asort)
{
@@ -499,7 +499,7 @@
}
/* }}} */
-/* {{{ proto bool arsort(array array_arg [, int sort_flags])
+/* {{{ proto bool arsort(array &array_arg [, int sort_flags])
Sort an array in reverse order and maintain index association */
PHP_FUNCTION(arsort)
{
@@ -521,7 +521,7 @@
}
/* }}} */
-/* {{{ proto bool sort(array array_arg [, int sort_flags])
+/* {{{ proto bool sort(array &array_arg [, int sort_flags])
Sort an array */
PHP_FUNCTION(sort)
{
@@ -543,7 +543,7 @@
}
/* }}} */
-/* {{{ proto bool rsort(array array_arg [, int sort_flags])
+/* {{{ proto bool rsort(array &array_arg [, int sort_flags])
Sort an array in reverse order */
PHP_FUNCTION(rsort)
{
@@ -2151,7 +2151,7 @@
/* }}} */
-/* {{{ proto array array_slice(array input, int offset [, int length])
+/* {{{ proto array array_slice(array input, int offset [, int length [, bool
preserve_keys]])
Returns elements specified by offset and length */
PHP_FUNCTION(array_slice)
{
@@ -3179,6 +3179,7 @@
php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_KEY,
INTERSECT_COMP_DATA_INTERNAL,
INTERSECT_COMP_KEY_INTERNAL);
}
+/* }}} */
/* {{{ proto array array_intersect_ukey(array arr1, array arr2 [, array ...],
callback key_compare_func)
Returns the entries of arr1 that have keys which are present in all the
other arguments. Kind of equivalent to array_diff(array_keys($arr1),
array_keys($arr2)[,array_keys(...)]). The comparison of the keys is performed
by a user supplied function. Equivalent of array_intersect_uassoc() but does
not do compare of the data. */
@@ -3187,7 +3188,7 @@
php_array_intersect(INTERNAL_FUNCTION_PARAM_PASSTHRU, INTERSECT_KEY,
INTERSECT_COMP_DATA_INTERNAL,
INTERSECT_COMP_KEY_USER);
}
-
+/* }}} */
/* {{{ proto array array_intersect(array arr1, array arr2 [, array ...])
Returns the entries of arr1 that have values which are present in all the
other arguments */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/formatted_print.c?r1=1.82.2.1&r2=1.82.2.1.2.1&diff_format=u
Index: php-src/ext/standard/formatted_print.c
diff -u php-src/ext/standard/formatted_print.c:1.82.2.1
php-src/ext/standard/formatted_print.c:1.82.2.1.2.1
--- php-src/ext/standard/formatted_print.c:1.82.2.1 Sun Jan 1 12:50:14 2006
+++ php-src/ext/standard/formatted_print.c Mon Jun 26 18:48:56 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: formatted_print.c,v 1.82.2.1 2006/01/01 12:50:14 sniper Exp $ */
+/* $Id: formatted_print.c,v 1.82.2.1.2.1 2006/06/26 18:48:56 bjori Exp $ */
#include <math.h> /* modf() */
#include "php.h"
@@ -853,6 +853,7 @@
RETURN_LONG(len);
}
+/* }}} */
/* {{{ proto int vfprintf(resource stream, string format, array args)
Output a formatted string into a stream */
@@ -883,7 +884,7 @@
RETURN_LONG(len);
}
-
+/* }}} */
/*
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/levenshtein.c?r1=1.34.2.1&r2=1.34.2.1.2.1&diff_format=u
Index: php-src/ext/standard/levenshtein.c
diff -u php-src/ext/standard/levenshtein.c:1.34.2.1
php-src/ext/standard/levenshtein.c:1.34.2.1.2.1
--- php-src/ext/standard/levenshtein.c:1.34.2.1 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/levenshtein.c Mon Jun 26 18:48:56 2006
@@ -15,7 +15,7 @@
| Author: Hartmut Holzgraefe <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: levenshtein.c,v 1.34.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: levenshtein.c,v 1.34.2.1.2.1 2006/06/26 18:48:56 bjori Exp $ */
#include "php.h"
#include <stdlib.h>
@@ -79,7 +79,7 @@
}
/* }}} */
-/* {{{ proto int levenshtein(string str1, string str2)
+/* {{{ proto int levenshtein(string str1, string str2[, int cost_ins, int
cost_rep, int cost_del])
Calculate Levenshtein distance between two strings */
PHP_FUNCTION(levenshtein)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/metaphone.c?r1=1.28.2.1&r2=1.28.2.1.2.1&diff_format=u
Index: php-src/ext/standard/metaphone.c
diff -u php-src/ext/standard/metaphone.c:1.28.2.1
php-src/ext/standard/metaphone.c:1.28.2.1.2.1
--- php-src/ext/standard/metaphone.c:1.28.2.1 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/metaphone.c Mon Jun 26 18:48:56 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: metaphone.c,v 1.28.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: metaphone.c,v 1.28.2.1.2.1 2006/06/26 18:48:56 bjori Exp $ */
/*
Based on CPANs "Text-Metaphone-1.96" by Michael G Schwern <[EMAIL
PROTECTED]>
@@ -29,7 +29,7 @@
PHP_FUNCTION(metaphone);
-/* {{{ proto string metaphone(string text, int phones)
+/* {{{ proto string metaphone(string text[, int phones])
Break english phrases down into their phonemes */
PHP_FUNCTION(metaphone)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6.2.1&r2=1.58.2.6.2.2&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.1
php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.2
--- php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.1 Mon Jun 26 16:33:39 2006
+++ php-src/ext/standard/streamsfuncs.c Mon Jun 26 18:48:56 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.58.2.6.2.1 2006/06/26 16:33:39 bjori Exp $ */
+/* $Id: streamsfuncs.c,v 1.58.2.6.2.2 2006/06/26 18:48:56 bjori Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1117,6 +1117,7 @@
RETURN_FALSE;
}
}
+/* }}} */
/* {{{ proto resource stream_filter_prepend(resource stream, string
filtername[, int read_write[, string filterparams]])
Prepend a filter to a stream */
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.3&r2=1.445.2.14.2.4&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.3
php-src/ext/standard/string.c:1.445.2.14.2.4
--- php-src/ext/standard/string.c:1.445.2.14.2.3 Sun Jun 11 21:55:49 2006
+++ php-src/ext/standard/string.c Mon Jun 26 18:48:56 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.3 2006/06/11 21:55:49 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.4 2006/06/26 18:48:56 bjori Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1333,7 +1333,7 @@
}
/* }}} */
-/* {{{ proto array pathinfo(string path)
+/* {{{ proto array pathinfo(string path[, int options])
Returns information about a certain string */
PHP_FUNCTION(pathinfo)
{
@@ -2503,7 +2503,7 @@
}
/* }}} */
-/* {{{ proto string strtr(string str, string from, string to)
+/* {{{ proto string strtr(string str, string from[, string to])
Translates characters in str using given translation tables */
PHP_FUNCTION(strtr)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/url.c?r1=1.86.2.5&r2=1.86.2.5.2.1&diff_format=u
Index: php-src/ext/standard/url.c
diff -u php-src/ext/standard/url.c:1.86.2.5
php-src/ext/standard/url.c:1.86.2.5.2.1
--- php-src/ext/standard/url.c:1.86.2.5 Sun Feb 12 16:39:44 2006
+++ php-src/ext/standard/url.c Mon Jun 26 18:48:56 2006
@@ -15,7 +15,7 @@
| Author: Jim Winstead <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
*/
-/* $Id: url.c,v 1.86.2.5 2006/02/12 16:39:44 iliaa Exp $ */
+/* $Id: url.c,v 1.86.2.5.2.1 2006/06/26 18:48:56 bjori Exp $ */
#include <stdlib.h>
#include <string.h>
@@ -653,7 +653,7 @@
}
/* }}} */
-/* {{{ proto array get_headers(string url)
+/* {{{ proto array get_headers(string url[, int format])
fetches all the headers sent by the server in response to a HTTP request */
PHP_FUNCTION(get_headers)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/uuencode.c?r1=1.5.2.1&r2=1.5.2.1.2.1&diff_format=u
Index: php-src/ext/standard/uuencode.c
diff -u php-src/ext/standard/uuencode.c:1.5.2.1
php-src/ext/standard/uuencode.c:1.5.2.1.2.1
--- php-src/ext/standard/uuencode.c:1.5.2.1 Sun Jan 1 12:50:15 2006
+++ php-src/ext/standard/uuencode.c Mon Jun 26 18:48:56 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: uuencode.c,v 1.5.2.1 2006/01/01 12:50:15 sniper Exp $ */
+/* $Id: uuencode.c,v 1.5.2.1.2.1 2006/06/26 18:48:56 bjori Exp $ */
/*
* Portions of this code are based on Berkeley's uuencode/uudecode
@@ -183,7 +183,7 @@
return -1;
}
-/* {{{ proto string uuencode(string data)
+/* {{{ proto string convert_uuencode(string data)
uuencode a string */
PHP_FUNCTION(convert_uuencode)
{
@@ -200,7 +200,7 @@
}
/* }}} */
-/* {{{ proto string uudecode(string data)
+/* {{{ proto string convert_uudecode(string data)
decode a uuencoded string */
PHP_FUNCTION(convert_uudecode)
{
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/versioning.c?r1=1.19.2.1&r2=1.19.2.1.2.1&diff_format=u
Index: php-src/ext/standard/versioning.c
diff -u php-src/ext/standard/versioning.c:1.19.2.1
php-src/ext/standard/versioning.c:1.19.2.1.2.1
--- php-src/ext/standard/versioning.c:1.19.2.1 Sun Jan 1 12:50:16 2006
+++ php-src/ext/standard/versioning.c Mon Jun 26 18:48:56 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: versioning.c,v 1.19.2.1 2006/01/01 12:50:16 sniper Exp $ */
+/* $Id: versioning.c,v 1.19.2.1.2.1 2006/06/26 18:48:56 bjori Exp $ */
#include <stdio.h>
#include <sys/types.h>
@@ -204,8 +204,6 @@
}
/* }}} */
-/* {{{ do_version_compare() */
-
/* {{{ proto int version_compare(string ver1, string ver2 [, string oper])
Compares two "PHP-standardized" version number strings */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
