mirror of
https://github.com/php/php-src.git
synced 2026-03-24 00:02:20 +01:00
Merge branch 'PHP-8.5'
* PHP-8.5: ext/phar: use size_t type instead of int
This commit is contained in:
@@ -1596,7 +1596,7 @@ zend_result phar_open_from_filename(char *fname, size_t fname_len, char *alias,
|
||||
}
|
||||
/* }}}*/
|
||||
|
||||
static inline char *phar_strnstr(const char *buf, int buf_len, const char *search, int search_len) /* {{{ */
|
||||
static inline char *phar_strnstr(const char *buf, size_t buf_len, const char *search, size_t search_len) /* {{{ */
|
||||
{
|
||||
const char *c;
|
||||
ptrdiff_t so_far = 0;
|
||||
|
||||
@@ -665,7 +665,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
|
||||
{
|
||||
php_url *resource;
|
||||
char *internal_file, *error;
|
||||
int internal_file_len;
|
||||
size_t internal_file_len;
|
||||
phar_entry_data *idata;
|
||||
phar_archive_data *pphar;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user