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/zip: Fix const-generic compile warning
This commit is contained in:
@@ -118,12 +118,11 @@ static int php_zip_ops_stat(php_stream *stream, php_stream_statbuf *ssb) /* {{{
|
||||
size_t path_len = strlen(stream->orig_path);
|
||||
char file_dirname[MAXPATHLEN];
|
||||
struct zip *za;
|
||||
char *fragment;
|
||||
size_t fragment_len;
|
||||
int err;
|
||||
zend_string *file_basename;
|
||||
|
||||
fragment = strchr(path, '#');
|
||||
const char *fragment = strchr(path, '#');
|
||||
if (!fragment) {
|
||||
return -1;
|
||||
}
|
||||
@@ -281,14 +280,13 @@ php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper,
|
||||
|
||||
struct zip *za;
|
||||
struct zip_file *zf = NULL;
|
||||
char *fragment;
|
||||
size_t fragment_len;
|
||||
int err;
|
||||
|
||||
php_stream *stream = NULL;
|
||||
struct php_zip_stream_data_t *self;
|
||||
|
||||
fragment = strchr(path, '#');
|
||||
const char *fragment = strchr(path, '#');
|
||||
if (!fragment) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user