com php-src: Expose fputcsv's escape_char to userland: ext/standard/file.c

From: Date: Wed, 16 Oct 2013 10:18:19 +0000
Subject: com php-src: Expose fputcsv's escape_char to userland: ext/standard/file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73447@lists.php.net to get a copy of this message
Commit: e6095aa4cbfc30d34629e8119915f25edd39202c Author: Joey Smith <joeysmith@gmail.com> Thu, 13 Sep 2012 12:37:48 -0600 Committer: Anatol Belski <ab@php.net> Wed, 16 Oct 2013 03:18:19 -0700 Parents: 983db235b0a6b36a65df808576d25ecb4c6b48ad Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e6095aa4cbfc30d34629e8119915f25edd39202c Log: Expose fputcsv's escape_char to userland Allows users to assert that something other than the backslash should be considered an escape char; also follows the RFC 4180 recommendation that fields containing a " be enclosed. Changed paths: M ext/standard/file.c Diff: diff --git a/ext/standard/file.c b/ext/standard/file.c index a01b421..f0d835f 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1814,11 +1814,19 @@ PHP_FUNCTION(fputcsv) char escape_char = '\\'; /* allow this to be set as parameter */ php_stream *stream; zval *fp = NULL, *fields = NULL; +<<<<<<< HEAD zend_str_size_int ret; char *delimiter_str = NULL, *enclosure_str = NULL, *escape_str = NULL; zend_str_size_int delimiter_str_len = 0, enclosure_str_len = 0, escape_str_len = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ra|SS", +======= + int ret; + char *delimiter_str = NULL, *enclosure_str = NULL, *escape_str = NULL; + int delimiter_str_len = 0, enclosure_str_len = 0, escape_str_len = 0; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ra|sss", +>>>>>>> Expose fputcsv's escape_char to userland &fp, &fields, &delimiter_str, &delimiter_str_len, &enclosure_str, &enclosure_str_len, &escape_str, &escape_str_len) == FAILURE) {

« previous php.cvs (#73447) next »