cvs: php-src /ext/standard array.c formatted_print.c levenshtein.c metaphone.c streamsfuncs.c string.c url.c uuencode.c versioning.c

From: Date: Sun, 25 Jun 2006 19:19:32 +0000
Subject: cvs: php-src /ext/standard array.c formatted_print.c levenshtein.c metaphone.c streamsfuncs.c string.c url.c uuencode.c versioning.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-38892@lists.php.net to get a copy of this message
bjori Sun Jun 25 19:19:32 2006 UTC Modified files: /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 Fixed vim folding

http://cvs.php.net/viewvc.cgi/php-src/ext/standard/array.c?r1=1.349&r2=1.350&diff_format=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.349 php-src/ext/standard/array.c:1.350 --- php-src/ext/standard/array.c:1.349 Sat Jun 3 18:58:40 2006 +++ php-src/ext/standard/array.c Sun Jun 25 19:19:31 2006 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.349 2006/06/03 18:58:40 andrei Exp $ */ +/* $Id: array.c,v 1.350 2006/06/25 19:19:31 bjori Exp $ */ #include "php.h" #include "php_ini.h" @@ -225,7 +225,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) { @@ -247,7 +247,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) { @@ -460,7 +460,7 @@ } -/* {{{ proto void natsort(array array_arg) +/* {{{ proto void natsort(array &array_arg) Sort an array using natural sort */ PHP_FUNCTION(natsort) { @@ -469,7 +469,7 @@ /* }}} */ -/* {{{ proto void natcasesort(array array_arg) +/* {{{ proto void natcasesort(array &array_arg) Sort an array using case-insensitive natural sort */ PHP_FUNCTION(natcasesort) { @@ -478,7 +478,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) { @@ -500,7 +500,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) { @@ -522,7 +522,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) { @@ -544,7 +544,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) { @@ -2306,7 +2306,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) { @@ -3372,6 +3372,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. */ @@ -3380,7 +3381,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.83&r2=1.84&diff_format=u Index: php-src/ext/standard/formatted_print.c diff -u php-src/ext/standard/formatted_print.c:1.83 php-src/ext/standard/formatted_print.c:1.84 --- php-src/ext/standard/formatted_print.c:1.83 Sun Jan 1 13:09:55 2006 +++ php-src/ext/standard/formatted_print.c Sun Jun 25 19:19:31 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: formatted_print.c,v 1.83 2006/01/01 13:09:55 sniper Exp $ */ +/* $Id: formatted_print.c,v 1.84 2006/06/25 19:19:31 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.39&r2=1.40&diff_format=u Index: php-src/ext/standard/levenshtein.c diff -u php-src/ext/standard/levenshtein.c:1.39 php-src/ext/standard/levenshtein.c:1.40 --- php-src/ext/standard/levenshtein.c:1.39 Thu Mar 2 13:12:45 2006 +++ php-src/ext/standard/levenshtein.c Sun Jun 25 19:19:31 2006 @@ -15,7 +15,7 @@ | Author: Hartmut Holzgraefe <hholzgra@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: levenshtein.c,v 1.39 2006/03/02 13:12:45 dmitry Exp $ */ +/* $Id: levenshtein.c,v 1.40 2006/06/25 19:19:31 bjori Exp $ */ #include "php.h" #include <stdlib.h> @@ -98,7 +98,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.29&r2=1.30&diff_format=u Index: php-src/ext/standard/metaphone.c diff -u php-src/ext/standard/metaphone.c:1.29 php-src/ext/standard/metaphone.c:1.30 --- php-src/ext/standard/metaphone.c:1.29 Sun Jan 1 13:09:55 2006 +++ php-src/ext/standard/metaphone.c Sun Jun 25 19:19:31 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: metaphone.c,v 1.29 2006/01/01 13:09:55 sniper Exp $ */ +/* $Id: metaphone.c,v 1.30 2006/06/25 19:19:31 bjori Exp $ */ /* Based on CPANs "Text-Metaphone-1.96" by Michael G Schwern <schwern@pobox.com> @@ -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.78&r2=1.79&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.78 php-src/ext/standard/streamsfuncs.c:1.79 --- php-src/ext/standard/streamsfuncs.c:1.78 Sun Jun 11 20:33:29 2006 +++ php-src/ext/standard/streamsfuncs.c Sun Jun 25 19:19:31 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.78 2006/06/11 20:33:29 bjori Exp $ */ +/* $Id: streamsfuncs.c,v 1.79 2006/06/25 19:19:31 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -1200,6 +1200,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.545&r2=1.546&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.545 php-src/ext/standard/string.c:1.546 --- php-src/ext/standard/string.c:1.545 Sun Jun 11 20:33:29 2006 +++ php-src/ext/standard/string.c Sun Jun 25 19:19:31 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.545 2006/06/11 20:33:29 bjori Exp $ */ +/* $Id: string.c,v 1.546 2006/06/25 19:19:31 bjori Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -1893,7 +1893,7 @@ } /* }}} */ -/* {{{ proto array pathinfo(string path) +/* {{{ proto array pathinfo(string path[, int options]) Returns information about a certain string */ PHP_FUNCTION(pathinfo) { @@ -2303,7 +2303,7 @@ } /* }}} */ -/* {{{ proto string strchr(string haystack, string needle) +/* {{{ proto string strchr(string haystack, string needle[, bool part]) An alias for strstr */ /* }}} */ @@ -3821,7 +3821,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.92&r2=1.93&diff_format=u Index: php-src/ext/standard/url.c diff -u php-src/ext/standard/url.c:1.92 php-src/ext/standard/url.c:1.93 --- php-src/ext/standard/url.c:1.92 Thu Mar 2 13:12:45 2006 +++ php-src/ext/standard/url.c Sun Jun 25 19:19:31 2006 @@ -15,7 +15,7 @@ | Author: Jim Winstead <jimw@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: url.c,v 1.92 2006/03/02 13:12:45 dmitry Exp $ */ +/* $Id: url.c,v 1.93 2006/06/25 19:19:31 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.6&r2=1.7&diff_format=u Index: php-src/ext/standard/uuencode.c diff -u php-src/ext/standard/uuencode.c:1.6 php-src/ext/standard/uuencode.c:1.7 --- php-src/ext/standard/uuencode.c:1.6 Sun Jan 1 13:09:56 2006 +++ php-src/ext/standard/uuencode.c Sun Jun 25 19:19:31 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: uuencode.c,v 1.6 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: uuencode.c,v 1.7 2006/06/25 19:19:31 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.20&r2=1.21&diff_format=u Index: php-src/ext/standard/versioning.c diff -u php-src/ext/standard/versioning.c:1.20 php-src/ext/standard/versioning.c:1.21 --- php-src/ext/standard/versioning.c:1.20 Sun Jan 1 13:09:56 2006 +++ php-src/ext/standard/versioning.c Sun Jun 25 19:19:31 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: versioning.c,v 1.20 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: versioning.c,v 1.21 2006/06/25 19:19:31 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 */
« previous php.cvs (#38892) next »