Remove unnecassry Zend API macros #6029
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I'd prefer to keep the zval_dtor alias, it used to be used quite heavily. |
Girgias
force-pushed
the
refactor-zend-useless-apis
branch
from
b7972a9 to
2f82eb9
Compare
nikic
reviewed
Aug 25, 2020
Zend/zend_language_scanner.l
Outdated
| @@ -699,7 +699,7 @@ ZEND_API zend_ast *zend_compile_string_to_ast( | |||
| zend_restore_lexical_state(&original_lex_state); | |||
| CG(in_compilation) = original_in_compilation; | |||
|
|
|||
| zval_dtor(&code_zv); | |||
| zval_ptr_dtor_nogc(&code_zv); | |||
There was a problem hiding this comment.
Might as well use zval_ptr_dtor_str(&code_zv)
ext/fileinfo/libmagic/apprentice.c
Outdated
| @@ -2597,10 +2597,10 @@ getvalue(struct magic_set *ms, struct magic *m, const char **p, int action) | |||
| convert_libmagic_pattern(&pattern, m->value.s, strlen(m->value.s), options); | |||
|
|
|||
| if ((pce = pcre_get_compiled_regex_cache(Z_STR(pattern))) == NULL) { | |||
| zval_dtor(&pattern); | |||
| zval_ptr_dtor_nogc(&pattern); | |||
There was a problem hiding this comment.
Actually, it would be even better if convert_libmagic_pattern were changed to return zend_string*. There's no point in going through a zval here.
win32/signal.c
Outdated
| @@ -110,7 +110,7 @@ PHP_FUNCTION(sapi_windows_set_ctrl_handler) | |||
| } | |||
|
|
|||
| if (!ZEND_FCI_INITIALIZED(fci)) { | |||
| zval_dtor(&ctrl_handler); | |||
| zval_ptr_dtor_nogc(&ctrl_handler); | |||
There was a problem hiding this comment.
This should use just zval_ptr_dtor. Might be circular.
As the last argument of zend_hash_init_ex() is never used
As this API was used extensively previously This reverts commit b752489.
Girgias
force-pushed
the
refactor-zend-useless-apis
branch
from
2f82eb9 to
61932ff
Compare
nikic
approved these changes
Aug 26, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes APIs provided by Zend via macros as a compatibility layer or to cover up unused arguments.
The only one which had some usage other than
zend_hash_init_ex()iszval_dtor()whose expansion iszval_ptr_dtor_nogc()which seems rather strange and I suppose they should usezval_ptr_dtor()for the most part.