@@ -1966,7 +1966,8 @@ static zend_result spl_filesystem_file_read_csv(spl_filesystem_object *intern, c
1966
1966
}
1967
1967
/* }}} */
1968
1968
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 ) /* {{{ */
1970
1971
{
1971
1972
zval retval ;
1972
1973
@@ -1978,9 +1979,6 @@ static zend_result spl_filesystem_file_read_line_ex(zval * this_ptr, spl_filesys
1978
1979
spl_filesystem_file_free_line (intern );
1979
1980
1980
1981
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
- }
1984
1982
return FAILURE ;
1985
1983
}
1986
1984
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
2004
2002
zval_ptr_dtor (& retval );
2005
2003
return SUCCESS ;
2006
2004
} else {
2007
- return spl_filesystem_file_read (intern , silent );
2005
+ return spl_filesystem_file_read (intern , /* silent */ true );
2008
2006
}
2009
2007
} /* }}} */
2010
2008
@@ -2050,11 +2048,11 @@ static bool spl_filesystem_file_is_empty_line(spl_filesystem_object *intern) /*
2050
2048
/* Call to this function reads a line in a "silent" fashion and does not throw an exception */
2051
2049
static zend_result spl_filesystem_file_read_line (zval * this_ptr , spl_filesystem_object * intern ) /* {{{ */
2052
2050
{
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 );
2054
2052
2055
2053
while (SPL_HAS_FLAG (intern -> flags , SPL_FILE_OBJECT_SKIP_EMPTY ) && ret == SUCCESS && spl_filesystem_file_is_empty_line (intern )) {
2056
2054
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 );
2058
2056
}
2059
2057
2060
2058
return ret ;
0 commit comments