Skip to content

Commit bb3d093

Browse files
committed
Remove silent argument to spl_filesystem_file_read_line_ex()
true was always passed to it
1 parent a055c54 commit bb3d093

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

ext/spl/spl_directory.c

+5-7
Original file line numberDiff line numberDiff line change
@@ -1966,7 +1966,8 @@ static zend_result spl_filesystem_file_read_csv(spl_filesystem_object *intern, c
19661966
}
19671967
/* }}} */
19681968

1969-
static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesystem_object *intern, bool silent) /* {{{ */
1969+
/* Call to this function reads a line in a "silent" fashion and does not throw an exception */
1970+
static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesystem_object *intern) /* {{{ */
19701971
{
19711972
zval retval;
19721973

@@ -1978,9 +1979,6 @@ static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesys
19781979
spl_filesystem_file_free_line(intern);
19791980

19801981
if (php_stream_eof(intern->u.file.stream)) {
1981-
if (!silent) {
1982-
zend_throw_exception_ex(spl_ce_RuntimeException, 0, "Cannot read from file %s", ZSTR_VAL(intern->file_name));
1983-
}
19841982
return FAILURE;
19851983
}
19861984
zend_call_method_with_0_params(Z_OBJ_P(this_ptr), Z_OBJCE_P(this_ptr), &intern->u.file.func_getCurr, "getCurrentLine", &retval);
@@ -2004,7 +2002,7 @@ static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesys
20042002
zval_ptr_dtor(&retval);
20052003
return SUCCESS;
20062004
} else {
2007-
return spl_filesystem_file_read(intern, silent);
2005+
return spl_filesystem_file_read(intern, /* silent */ true);
20082006
}
20092007
} /* }}} */
20102008

@@ -2050,11 +2048,11 @@ static bool spl_filesystem_file_is_empty_line(spl_filesystem_object *intern) /*
20502048
/* Call to this function reads a line in a "silent" fashion and does not throw an exception */
20512049
static zend_result spl_filesystem_file_read_line(zval * this_ptr, spl_filesystem_object *intern) /* {{{ */
20522050
{
2053-
zend_result ret = spl_filesystem_file_read_line_ex(this_ptr, intern, /* silent */ true);
2051+
zend_result ret = spl_filesystem_file_read_line_ex(this_ptr, intern);
20542052

20552053
while (SPL_HAS_FLAG(intern->flags, SPL_FILE_OBJECT_SKIP_EMPTY) && ret == SUCCESS && spl_filesystem_file_is_empty_line(intern)) {
20562054
spl_filesystem_file_free_line(intern);
2057-
ret = spl_filesystem_file_read_line_ex(this_ptr, intern, /* silent */ true);
2055+
ret = spl_filesystem_file_read_line_ex(this_ptr, intern);
20582056
}
20592057

20602058
return ret;

0 commit comments

Comments
 (0)