cvs: php-src /main php_streams.h /main/streams streams.c

pollita Tue Apr 18 19:09:31 2006 UTC Modified files: /php-src/main php_streams.h /php-src/main/streams streams.c Log: Fix copy/paste typo in php_stream_path_decode() proto http://cvs.php.net/viewcvs.cgi/php-src/main/php_streams.h?r1=1.111&r2=1.112&diff_format=u Index: php-src/main/php_streams.h diff -u php-src/main/php_streams.h:1.111 php-src/main/php_streams.h:1.112 --- php-src/main/php_streams.h:1.111 Fri Mar 31 22:51:37 2006 +++ php-src/main/php_streams.h Tue Apr 18 19:09:31 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_streams.h,v 1.111 2006/03/31 22:51:37 pollita Exp $ */ +/* $Id: php_streams.h,v 1.112 2006/04/18 19:09:31 pollita Exp $ */ #ifndef PHP_STREAMS_H #define PHP_STREAMS_H @@ -380,7 +380,7 @@ _php_stream_path_encode((wrapper), (pathenc), (pathenc_len), (path), (path_len), (options), (context) TSRMLS_CC) PHPAPI int _php_stream_path_decode(php_stream_wrapper *wrapper, - char **pathdec, int *pathdec_len, UChar *path, int path_len, + UChar **pathdec, int *pathdec_len, char *path, int path_len, int options, php_stream_context *context TSRMLS_DC); #define php_stream_path_decode(wrapper, pathdec, pathdec_len, path, path_len, options, context) \ _php_stream_path_decode((wrapper), (pathdec), (pathdec_len), (path), (path_len), (options), (context) TSRMLS_CC) http://cvs.php.net/viewcvs.cgi/php-src/main/streams/streams.c?r1=1.120&r2=1.121&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.120 php-src/main/streams/streams.c:1.121 --- php-src/main/streams/streams.c:1.120 Wed Apr 12 22:40:56 2006 +++ php-src/main/streams/streams.c Tue Apr 18 19:09:31 2006 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.120 2006/04/12 22:40:56 pollita Exp $ */ +/* $Id: streams.c,v 1.121 2006/04/18 19:09:31 pollita Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -2653,7 +2653,7 @@ Otherwise (or if wrapper == NULL) the INI defined filesystem_encoding converter will be used. */ PHPAPI int _php_stream_path_decode(php_stream_wrapper *wrapper, - char **pathdec, int *pathdec_len, UChar *path, int path_len, + UChar **pathdec, int *pathdec_len, char *path, int path_len, int options, php_stream_context *context TSRMLS_DC) { int num_conv;