Skip to content

ext/zip: Remove libzip < 1.0 compatibility code #25080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LamentXU123 merged 1 commit into from
Oct 31, 2026
+1 −12
Merged

ext/zip: Remove libzip < 1.0 compatibility code #25080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions ext/zip/php_zip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,26 +138,15 @@ static char * php_zip_make_relative_path(char *path, size_t path_len) /* {{{ */
/* }}} */

/* {{{ php_zip_file_error
Entry error code, plus its message when message is not NULL.
zip_error_t and its accessors only exist since libzip 1.0. */
Entry error code, plus its message when message is not NULL. */
static int php_zip_file_error(struct zip_file *zf, const char **message)
{
#if LIBZIP_VERSION_MAJOR < 1
int zep, syp;

zip_file_error_get(zf, &zep, &syp);
if (message) {
*message = zip_file_strerror(zf);
}
return zep;
#else
zip_error_t *err = zip_file_get_error(zf);

if (message) {
*message = zip_error_strerror(err);
}
return zip_error_code_zip(err);
#endif
}
/* }}} */

Expand Down
Loading