From 7cbd4f31c413919d0c985f6de170b89d7bfdbf75 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Wed, 19 Jun 2019 17:02:54 +0200 Subject: [PATCH] Remove copy argument from php_glob_stream_get_path/pattern This is unused, and shouldn't be part of the API. --- ext/spl/spl_directory.c | 2 +- main/streams/glob_wrapper.c | 16 ++++------------ main/streams/php_stream_glob_wrapper.h | 8 ++++---- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index 7e9289c902..676f107c35 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -189,7 +189,7 @@ PHPAPI char* spl_filesystem_object_get_path(spl_filesystem_object *intern, size_ #ifdef HAVE_GLOB if (intern->type == SPL_FS_DIR) { if (php_stream_is(intern->u.dir.dirp ,&php_glob_stream_ops)) { - return php_glob_stream_get_path(intern->u.dir.dirp, 0, len); + return php_glob_stream_get_path(intern->u.dir.dirp, len); } } #endif diff --git a/main/streams/glob_wrapper.c b/main/streams/glob_wrapper.c index f0c969a650..0386d72255 100644 --- a/main/streams/glob_wrapper.c +++ b/main/streams/glob_wrapper.c @@ -45,7 +45,7 @@ typedef struct { size_t pattern_len; } glob_s_t; -PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, size_t *plen STREAMS_DC) /* {{{ */ +PHPAPI char* _php_glob_stream_get_path(php_stream *stream, size_t *plen STREAMS_DC) /* {{{ */ { glob_s_t *pglob = (glob_s_t *)stream->abstract; @@ -53,11 +53,7 @@ PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, size_t *ple if (plen) { *plen = pglob->path_len; } - if (copy) { - return estrndup(pglob->path, pglob->path_len); - } else { - return pglob->path; - } + return pglob->path; } else { if (plen) { *plen = 0; @@ -67,7 +63,7 @@ PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, size_t *ple } /* }}} */ -PHPAPI char* _php_glob_stream_get_pattern(php_stream *stream, int copy, size_t *plen STREAMS_DC) /* {{{ */ +PHPAPI char* _php_glob_stream_get_pattern(php_stream *stream, size_t *plen STREAMS_DC) /* {{{ */ { glob_s_t *pglob = (glob_s_t *)stream->abstract; @@ -75,11 +71,7 @@ PHPAPI char* _php_glob_stream_get_pattern(php_stream *stream, int copy, size_t * if (plen) { *plen = pglob->pattern_len; } - if (copy) { - return estrndup(pglob->pattern, pglob->pattern_len); - } else { - return pglob->pattern; - } + return pglob->pattern; } else { if (plen) { *plen = 0; diff --git a/main/streams/php_stream_glob_wrapper.h b/main/streams/php_stream_glob_wrapper.h index 31ba5b2ca0..644e5ab7e4 100644 --- a/main/streams/php_stream_glob_wrapper.h +++ b/main/streams/php_stream_glob_wrapper.h @@ -21,11 +21,11 @@ PHPAPI extern const php_stream_ops php_glob_stream_ops; BEGIN_EXTERN_C() -PHPAPI char* _php_glob_stream_get_path(php_stream *stream, int copy, size_t *plen STREAMS_DC); -#define php_glob_stream_get_path(stream, copy, plen) _php_glob_stream_get_path((stream), (copy), (plen) STREAMS_CC) +PHPAPI char* _php_glob_stream_get_path(php_stream *stream, size_t *plen STREAMS_DC); +#define php_glob_stream_get_path(stream, plen) _php_glob_stream_get_path((stream), (plen) STREAMS_CC) -PHPAPI char* _php_glob_stream_get_pattern(php_stream *stream, int copy, size_t *plen STREAMS_DC); -#define php_glob_stream_get_pattern(stream, copy, plen) _php_glob_stream_get_pattern((stream), (copy), (plen) STREAMS_CC) +PHPAPI char* _php_glob_stream_get_pattern(php_stream *stream, size_t *plen STREAMS_DC); +#define php_glob_stream_get_pattern(stream, plen) _php_glob_stream_get_pattern((stream), (plen) STREAMS_CC) PHPAPI int _php_glob_stream_get_count(php_stream *stream, int *pflags STREAMS_DC); #define php_glob_stream_get_count(stream, pflags) _php_glob_stream_get_count((stream), (pflags) STREAMS_CC) -- 2.40.0