[php-src] master: streams: make php_stream_scandir() a proper function

From: Date: Mon, 27 Jul 2026 10:44:13 +0000
Subject: [php-src] master: streams: make php_stream_scandir() a proper function
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-140223@lists.php.net to get a copy of this message
Author: Gina Peter Banyard (Girgias) Date: 2026-07-27T11:44:03+01:00 Commit: https://github.com/php/php-src/commit/fae14143b5917e3c22ad1dd868bb544580c2166b Raw diff: https://github.com/php/php-src/commit/fae14143b5917e3c22ad1dd868bb544580c2166b.diff streams: make php_stream_scandir() a proper function By dropping the unused flags parameter of the _-prefixed version Changed paths: M main/php_streams.h M main/streams/streams.c Diff: diff --git a/main/php_streams.h b/main/php_streams.h index 56c9b700c972..313eff296a0f 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -408,9 +408,8 @@ PHPAPI php_stream_dirent *php_stream_readdir(php_stream *dirstream, php_stream_d PHPAPI int php_stream_dirent_alphasort(const zend_string **a, const zend_string **b); PHPAPI int php_stream_dirent_alphasortr(const zend_string **a, const zend_string **b); -PHPAPI int _php_stream_scandir(const char *dirname, zend_string **namelist[], int flags, php_stream_context *context, +PHPAPI int php_stream_scandir(const char *dirname, zend_string **namelist[], php_stream_context *context, int (*compare) (const zend_string **a, const zend_string **b)); -#define php_stream_scandir(dirname, namelist, context, compare) _php_stream_scandir((dirname), (namelist), 0, (context), (compare)) PHPAPI int php_stream_set_option(php_stream *stream, int option, int value, void *ptrparam); diff --git a/main/streams/streams.c b/main/streams/streams.c index aa357decc303..accc8832e767 100644 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -2371,8 +2371,7 @@ PHPAPI int php_stream_dirent_alphasortr(const zend_string **a, const zend_string } /* }}} */ -/* {{{ php_stream_scandir */ -PHPAPI int _php_stream_scandir(const char *dirname, zend_string **namelist[], int flags, php_stream_context *context, +PHPAPI int php_stream_scandir(const char *dirname, zend_string **namelist[], php_stream_context *context, int (*compare) (const zend_string **a, const zend_string **b)) { php_stream *stream; @@ -2427,4 +2426,3 @@ PHPAPI int _php_stream_scandir(const char *dirname, zend_string **namelist[], in efree(vector); return -1; } -/* }}} */

« previous php.cvs (#140223) next »