Skip to content

ext/phar: Remove phar_resolve_alias() #15860

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
merged 1 commit into from
Oct 2, 2024
Merged

ext/phar: Remove phar_resolve_alias() #15860

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions ext/phar/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ if test "$PHP_PHAR" != "no"; then
PHP_ADD_EXTENSION_DEP(phar, spl)
PHP_ADD_MAKEFILE_FRAGMENT

PHP_INSTALL_HEADERS([ext/phar], [php_phar.h])

AC_CONFIG_FILES([
$ext_dir/phar.1
$ext_dir/phar.phar.1
Expand Down
1 change: 0 additions & 1 deletion ext/phar/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ if (PHP_PHAR != "no") {
}
ADD_EXTENSION_DEP('phar', 'hash');
ADD_EXTENSION_DEP('phar', 'spl');
PHP_INSTALL_HEADERS("ext/phar", "php_phar.h");

ADD_MAKEFILE_FRAGMENT();
}
9 changes: 0 additions & 9 deletions ext/phar/php_phar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,7 @@

#define PHP_PHAR_VERSION PHP_VERSION

#include "ext/standard/basic_functions.h"
extern zend_module_entry phar_module_entry;
#define phpext_phar_ptr &phar_module_entry

#ifdef PHP_WIN32
#define PHP_PHAR_API __declspec(dllexport)
#else
#define PHP_PHAR_API PHPAPI
#endif

PHP_PHAR_API zend_result phar_resolve_alias(char *alias, size_t alias_len, char **filename, size_t *filename_len);

#endif /* PHP_PHAR_H */
13 changes: 0 additions & 13 deletions ext/phar/util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
*/

#include "phar_internal.h"
#include "php_phar.h"
#include "ext/hash/php_hash.h" /* Needed for PHP_HASH_API in ext/hash/php_hash_sha.h */
#include "ext/hash/php_hash_sha.h"
#include "ext/standard/md5.h"
Expand Down Expand Up @@ -975,18 +974,6 @@ phar_entry_info * phar_open_jit(phar_archive_data *phar, phar_entry_info *entry,
}
/* }}} */

PHP_PHAR_API zend_result phar_resolve_alias(char *alias, size_t alias_len, char **filename, size_t *filename_len) /* {{{ */ {
phar_archive_data *fd_ptr;
if (HT_IS_INITIALIZED(&PHAR_G(phar_alias_map))
&& NULL != (fd_ptr = zend_hash_str_find_ptr(&(PHAR_G(phar_alias_map)), alias, alias_len))) {
*filename = fd_ptr->fname;
*filename_len = fd_ptr->fname_len;
return SUCCESS;
}
return FAILURE;
}
/* }}} */

zend_result phar_free_alias(phar_archive_data *phar, char *alias, size_t alias_len) /* {{{ */
{
if (phar->refcount || phar->is_persistent) {
Expand Down
Loading