archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-20 09:24:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

eliminate a couple of compile warnings

Browse source
This commit is contained in:
Antony Dovgal 2006-11-09 01:06:45 +00:00
parent 8c5c0ce29c
commit e2070c4360
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
main/php_streams.h
View file

@ -156,9 +156,9 @@ typedef struct _php_stream_wrapper_ops {
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 @@ PHPAPI int _php_stream_set_option(php_stream *stream, int option, int value, voi
#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)

4
main/streams/streams.c
View file

@ -2664,7 +2664,7 @@ Otherwise the INI defined filesystem_encoding converter will be used
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 @@ If the wrapper supports its own decoding rules it will be dispatched to wrapper-
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;