diff options
| author | Antony Dovgal <tony2001@php.net> | 2007-10-06 21:15:46 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2007-10-06 21:15:46 +0000 |
| commit | 6549f5b4225785c1cec39a93728b0e939ffac906 (patch) | |
| tree | e1703c0ba241da98c9748ee4118187537551ddc2 | |
| parent | 9e8288e75e6e9d1f90ce39d1f208bc36f68aecf4 (diff) | |
| download | php-git-6549f5b4225785c1cec39a93728b0e939ffac906.tar.gz | |
fix ws and avoid freeing integer vars
| -rw-r--r-- | ext/standard/file.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index 14b0e4b8e8..b0d0443de4 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -2259,10 +2259,7 @@ cleanup: } /* }}} */ -PHPAPI void php_fgetcsv(php_stream *stream, /* {{{ */ - char delimiter, char enclosure, char escape, - size_t buf_len, char *buf, - zval *return_value TSRMLS_DC) +PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, char escape, size_t buf_len, char *buf, zval *return_value TSRMLS_DC) /* {{{ */ { char *delim = &delimiter, *enc = &enclosure, *buffer = buf, *esc; int delim_len = 1, enc_len = 1, esc_len = 1, buffer_len = buf_len; @@ -2273,7 +2270,6 @@ PHPAPI void php_fgetcsv(php_stream *stream, /* {{{ */ } if (type == IS_UNICODE) { - UChar esc = '\\'; /* Unicode stream, but binary delimiter/enclosures/prefetch, promote to unicode */ if (FAILURE == zend_string_to_unicode(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), (UChar**)&delim, &delim_len, &delimiter, 1 TSRMLS_CC)) { |