tony2001 Thu Nov 9 01:06:45 2006 UTC
Modified files:
/php-src/main php_streams.h
/php-src/main/streams streams.c
Log:
eliminate a couple of compile warnings
http://cvs.php.net/viewvc.cgi/php-src/main/php_streams.h?r1=1.117&r2=1.118&diff_format=u
Index: php-src/main/php_streams.h
diff -u php-src/main/php_streams.h:1.117 php-src/main/php_streams.h:1.118
--- php-src/main/php_streams.h:1.117 Tue Oct 3 23:22:21 2006
+++ php-src/main/php_streams.h Thu Nov 9 01:06:45 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_streams.h,v 1.117 2006/10/03 23:22:21 tony2001 Exp $ */
+/* $Id: php_streams.h,v 1.118 2006/11/09 01:06:45 tony2001 Exp $ */
#ifndef PHP_STREAMS_H
#define PHP_STREAMS_H
@@ -156,9 +156,9 @@
int (*stream_rmdir)(php_stream_wrapper *wrapper, char *url, int
options, php_stream_context *context TSRMLS_DC);
/* Unicode path manipulation -- Leave NULL to use
UG(filesystem_encoding_conv) for conversion */
- int (*path_encode)(php_stream_wrapper *wrapper, char **encpath, int
*encpath_len, UChar *path, int path_len,
+ int (*path_encode)(php_stream_wrapper *wrapper, char **encpath, int
*encpath_len, const UChar *path, int path_len,
int options, php_stream_context
*context TSRMLS_DC);
- int (*path_decode)(php_stream_wrapper *wrapper, UChar **decpath, int
*decpath_len, char *path, int path_len,
+ int (*path_decode)(php_stream_wrapper *wrapper, UChar **decpath, int
*decpath_len, const char *path, int path_len,
int options, php_stream_context
*context TSRMLS_DC);
} php_stream_wrapper_ops;
@@ -374,13 +374,13 @@
#define php_stream_set_chunk_size(stream, size)
_php_stream_set_option((stream), PHP_STREAM_OPTION_SET_CHUNK_SIZE, (size), NULL
TSRMLS_CC)
PHPAPI int _php_stream_path_encode(php_stream_wrapper *wrapper,
- char **pathenc, int *pathenc_len, UChar *path,
int path_len,
+ char **pathenc, int *pathenc_len, const UChar
*path, int path_len,
int options, php_stream_context *context
TSRMLS_DC);
#define php_stream_path_encode(wrapper, pathenc, pathenc_len, path, path_len,
options, context) \
_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,
- UChar **pathdec, int *pathdec_len, char *path,
int path_len,
+ UChar **pathdec, int *pathdec_len, const 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/viewvc.cgi/php-src/main/streams/streams.c?r1=1.140&r2=1.141&diff_format=u
Index: php-src/main/streams/streams.c
diff -u php-src/main/streams/streams.c:1.140
php-src/main/streams/streams.c:1.141
--- php-src/main/streams/streams.c:1.140 Sun Oct 8 13:34:24 2006
+++ php-src/main/streams/streams.c Thu Nov 9 01:06:45 2006
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.140 2006/10/08 13:34:24 bjori Exp $ */
+/* $Id: streams.c,v 1.141 2006/11/09 01:06:45 tony2001 Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -2664,7 +2664,7 @@
If wrapper == NULL, the path will be explored to locate the correct wrapper
*/
PHPAPI int _php_stream_path_encode(php_stream_wrapper *wrapper,
- char **pathenc, int *pathenc_len, UChar *path,
int path_len,
+ char **pathenc, int *pathenc_len, const UChar
*path, int path_len,
int options, php_stream_context *context
TSRMLS_DC)
{
UErrorCode status = U_ZERO_ERROR;
@@ -2745,7 +2745,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,
- UChar **pathdec, int *pathdec_len, char *path,
int path_len,
+ UChar **pathdec, int *pathdec_len, const char
*path, int path_len,
int options, php_stream_context *context
TSRMLS_DC)
{
int num_conv;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
