File tree Expand file tree Collapse file tree 1 file changed +2
-5
lines changed Expand file tree Collapse file tree 1 file changed +2
-5
lines changed Original file line number Diff line number Diff line change @@ -260,19 +260,16 @@ static zend_result spl_filesystem_object_get_file_name(spl_filesystem_object *in
260
260
return SUCCESS ;
261
261
} /* }}} */
262
262
263
- /* TODO Make void or have callers check return value */
264
- static bool spl_filesystem_dir_read (spl_filesystem_object * intern ) /* {{{ */
263
+ static void spl_filesystem_dir_read (spl_filesystem_object * intern ) /* {{{ */
265
264
{
266
265
if (intern -> file_name ) {
267
266
/* invalidate */
268
267
zend_string_release (intern -> file_name );
269
268
intern -> file_name = NULL ;
270
269
}
270
+
271
271
if (!intern -> u .dir .dirp || !php_stream_readdir (intern -> u .dir .dirp , & intern -> u .dir .entry )) {
272
272
intern -> u .dir .entry .d_name [0 ] = '\0' ;
273
- return 0 ;
274
- } else {
275
- return 1 ;
276
273
}
277
274
}
278
275
/* }}} */
You can’t perform that action at this time.
0 commit comments