[php-src] master: streams: refactor _php_stream_opendir() to use early returns

From: Date: Wed, 29 Jul 2026 14:07:02 +0000
Subject: [php-src] master: streams: refactor _php_stream_opendir() to use early returns
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-140311@lists.php.net to get a copy of this message
Author: Gina Peter Banyard (Girgias) Date: 2026-07-29T15:06:59+01:00 Commit: https://github.com/php/php-src/commit/0c84160e110e96ac329629b65f1eb52f02660eeb Raw diff: https://github.com/php/php-src/commit/0c84160e110e96ac329629b65f1eb52f02660eeb.diff streams: refactor _php_stream_opendir() to use early returns Changed paths: M main/streams/streams.c Diff: diff --git a/main/streams/streams.c b/main/streams/streams.c index d7d3d70782fc..59297ed8ba8b 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -2034,21 +2034,32 @@ PHPAPI php_stream *_php_stream_opendir(const char *path, int options, path_to_open = path; wrapper = php_stream_locate_url_wrapper(path, &path_to_open, options); - - if (wrapper && wrapper->wops->dir_opener) { - stream = wrapper->wops->dir_opener(wrapper, - path_to_open, "r", options & ~REPORT_ERRORS, NULL, - context STREAMS_REL_CC); - - if (stream) { - stream->wrapper = wrapper; - stream->flags |= PHP_STREAM_FLAG_NO_BUFFER | PHP_STREAM_FLAG_IS_DIR; + if (UNEXPECTED(wrapper == NULL)) { + if (options & REPORT_ERRORS) { + php_stream_display_wrapper_errors(NULL, context, PHP_STREAM_EC(OpenFailed), + "Failed to open directory"); + php_stream_tidy_wrapper_error_log(wrapper); } - } else if (wrapper) { + return NULL; + } + + if (UNEXPECTED(!wrapper->wops->dir_opener)) { php_stream_wrapper_log_warn(wrapper, context, options & ~REPORT_ERRORS, NoOpener, "not implemented"); + php_stream_display_wrapper_errors(wrapper, context, PHP_STREAM_EC(OpenFailed), + "Failed to open directory"); + php_stream_tidy_wrapper_error_log(wrapper); + return NULL; } - if (stream == NULL && (options & REPORT_ERRORS)) { + + stream = wrapper->wops->dir_opener(wrapper, + path_to_open, "r", options & ~REPORT_ERRORS, NULL, + context STREAMS_REL_CC); + + if (stream) { + stream->wrapper = wrapper; + stream->flags |= PHP_STREAM_FLAG_NO_BUFFER | PHP_STREAM_FLAG_IS_DIR; + } else if (options & REPORT_ERRORS) { php_stream_display_wrapper_errors(wrapper, context, PHP_STREAM_EC(OpenFailed), "Failed to open directory"); }

« previous php.cvs (#140311) next »