php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4' into PHP-8.5

Browse Source 
* PHP-8.4:
  ext/zip: Fix const-generic compile warning
This commit is contained in:
ndossche
2026-03-14 15:07:06 +01:00
parent ed3eb8519a b95f0ebc47
commit e0ac74fb52
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/zip/zip_stream.c
View File

@@ -125,12 +125,11 @@ static int php_zip_ops_stat(php_stream *stream, php_stream_statbuf *ssb) /* {{{
size_t path_len = strlen(stream->orig_path); size_t path_len = strlen(stream->orig_path);
char file_dirname[MAXPATHLEN]; char file_dirname[MAXPATHLEN];
struct zip *za; struct zip *za;
char *fragment;
size_t fragment_len; size_t fragment_len;
int err; int err;
zend_string *file_basename; zend_string *file_basename;
fragment = strchr(path, '#'); const char *fragment = strchr(path, '#');
if (!fragment) { if (!fragment) {
return -1; return -1;
} }
@@ -286,14 +285,13 @@ php_stream *php_stream_zip_opener(php_stream_wrapper *wrapper,
struct zip *za; struct zip *za;
struct zip_file *zf = NULL; struct zip_file *zf = NULL;
char *fragment;
size_t fragment_len; size_t fragment_len;
int err; int err;
php_stream *stream = NULL; php_stream *stream = NULL;
struct php_zip_stream_data_t *self; struct php_zip_stream_data_t *self;
fragment = strchr(path, '#'); const char *fragment = strchr(path, '#');
if (!fragment) { if (!fragment) {
return NULL; return NULL;
} }