Skip to content

Remove php_xsl_create_object() #12492

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.

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 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions UPGRADING.INTERNALS
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ PHP 8.4 INTERNALS UPGRADE NOTES
should either be inlined and undefined behavior fixed or it should be
replaced by a non-biased scaler.

c. ext/xsl
- The function php_xsl_create_object() was removed as it was not used
nor exported.

========================
4. OpCode changes
========================
Expand Down
35 changes: 0 additions & 35 deletions ext/xsl/php_xsl.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,41 +169,6 @@ void php_xsl_set_object(zval *wrapper, void *obj)
}
/* }}} */

/* {{{ php_xsl_create_object */
void php_xsl_create_object(xsltStylesheetPtr obj, zval *wrapper_in, zval *return_value )
{
zval *wrapper;
zend_class_entry *ce;

if (!obj) {
wrapper = wrapper_in;
ZVAL_NULL(wrapper);
return;
}

if ((wrapper = xsl_object_get_data((void *) obj))) {
ZVAL_COPY(wrapper, wrapper_in);
return;
}

if (!wrapper_in) {
wrapper = return_value;
} else {
wrapper = wrapper_in;
}


ce = xsl_xsltprocessor_class_entry;

if (!wrapper_in) {
object_init_ex(wrapper, ce);
}
php_xsl_set_object(wrapper, (void *) obj);

return;
}
/* }}} */

/* {{{ PHP_MSHUTDOWN_FUNCTION */
PHP_MSHUTDOWN_FUNCTION(xsl)
{
Expand Down
1 change: 0 additions & 1 deletion ext/xsl/php_xsl.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ static inline xsl_object *php_xsl_fetch_object(zend_object *obj) {

void php_xsl_set_object(zval *wrapper, void *obj);
void xsl_objects_free_storage(zend_object *object);
void php_xsl_create_object(xsltStylesheetPtr obj, zval *wrapper_in, zval *return_value );

void xsl_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs);
void xsl_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs);
Expand Down