Skip to content

Commit b79efec

Browse files
committed
Remove unused delimiter parameter in php_fgetcsv_lookup_trailing_spaces subroutine.
1 parent f6c9319 commit b79efec

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/standard/file.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,7 +1764,7 @@ PHPAPI PHP_FUNCTION(fread)
17641764
}
17651765
/* }}} */
17661766

1767-
static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t len, const char delimiter) /* {{{ */
1767+
static const char *php_fgetcsv_lookup_trailing_spaces(const char *ptr, size_t len) /* {{{ */
17681768
{
17691769
int inc_len;
17701770
unsigned char last_chars[2] = { 0, 0 };
@@ -2049,7 +2049,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, int
20492049
/* Strip trailing space from buf, saving end of line in case required for enclosure field */
20502050

20512051
bptr = buf;
2052-
tptr = (char *)php_fgetcsv_lookup_trailing_spaces(buf, buf_len, delimiter);
2052+
tptr = (char *)php_fgetcsv_lookup_trailing_spaces(buf, buf_len);
20532053
line_end_len = buf_len - (size_t)(tptr - buf);
20542054
line_end = limit = tptr;
20552055

@@ -2147,7 +2147,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, int
21472147
bptr = buf = new_buf;
21482148
hunk_begin = buf;
21492149

2150-
line_end = limit = (char *)php_fgetcsv_lookup_trailing_spaces(buf, buf_len, delimiter);
2150+
line_end = limit = (char *)php_fgetcsv_lookup_trailing_spaces(buf, buf_len);
21512151
line_end_len = buf_len - (size_t)(limit - buf);
21522152

21532153
state = 0;
@@ -2274,7 +2274,7 @@ PHPAPI void php_fgetcsv(php_stream *stream, char delimiter, char enclosure, int
22742274
memcpy(tptr, hunk_begin, bptr - hunk_begin);
22752275
tptr += (bptr - hunk_begin);
22762276

2277-
comp_end = (char *)php_fgetcsv_lookup_trailing_spaces(temp, tptr - temp, delimiter);
2277+
comp_end = (char *)php_fgetcsv_lookup_trailing_spaces(temp, tptr - temp);
22782278
if (*bptr == delimiter) {
22792279
bptr++;
22802280
}

0 commit comments

Comments
 (0)