archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

make valgrind and gcc happy

Browse source
This commit is contained in:
Antony Dovgal 2005-08-12 23:21:29 +00:00
parent 29573483de
commit 6bd0350af8
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
main/streams/streams.c
View file

@ -2379,7 +2379,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
if (wrapper) { if (wrapper) {
stream = wrapper->wops->stream_opener(wrapper, stream = wrapper->wops->stream_opener(wrapper,
path_to_open, implicit_mode, options ^ REPORT_ERRORS, path_to_open, (char *)implicit_mode, options ^ REPORT_ERRORS,
opened_path, context STREAMS_REL_CC TSRMLS_CC); opened_path, context STREAMS_REL_CC TSRMLS_CC);
/* if the caller asked for a persistent stream but the wrapper did not /* if the caller asked for a persistent stream but the wrapper did not
@ -2441,7 +2441,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
} }
/* Output encoding on text mode streams defaults to utf8 unless specified in context parameter */ /* Output encoding on text mode streams defaults to utf8 unless specified in context parameter */
if (stream && strchr(implicit_mode, 't') && (strchr(implicit_mode, 'w') || strchr(implicit_mode, 'a') || strchr(implicit_mode, '+'))) { if (stream && memchr(implicit_mode, 't', modelen) && (memchr(implicit_mode, 'w', modelen) || memchr(implicit_mode, 'a', modelen) || memchr(implicit_mode, '+', modelen))) {
php_stream_filter *filter; php_stream_filter *filter;
char *encoding = (context && context->output_encoding) ? context->output_encoding : "utf8"; char *encoding = (context && context->output_encoding) ? context->output_encoding : "utf8";
char *filtername; char *filtername;
@ -2460,7 +2460,7 @@ PHPAPI php_stream *_php_stream_open_wrapper_ex(char *path, char *mode, int optio
efree(filtername); efree(filtername);
} }
if (stream && strchr(implicit_mode, 't') && (strchr(implicit_mode, 'r') || strchr(implicit_mode, '+'))) { if (stream && memchr(implicit_mode, 't', modelen) && (memchr(implicit_mode, 'r', modelen) || memchr(implicit_mode, '+', modelen))) {
php_stream_filter *filter; php_stream_filter *filter;
char *filtername; char *filtername;
char *encoding = (context && context->input_encoding) ? context->input_encoding : "utf8"; char *encoding = (context && context->input_encoding) ? context->input_encoding : "utf8";