sapi/phpdbg: Use HASH_FOREACH macro #16211
Merged
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
nielsdos
requested changes
Oct 4, 2024
|
|
||
| zend_hash_internal_pointer_reset_ex(Z_ARRVAL(zbacktrace), &position); | ||
| line = zend_get_executed_lineno(); | ||
| file = zend_get_executed_filename_ex(); |
There was a problem hiding this comment.
Unlike zend_get_executed_filename, this can return NULL.
There was a problem hiding this comment.
I'm not sure why that is a problem? file is always guarded by a NULL check.
sapi/phpdbg/phpdbg_frame.c
Outdated
| i++; | ||
| } else { | ||
| phpdbg_out(" => "); | ||
| phpdbg_dump_prototype(tmp); | ||
| phpdbg_out(" (internal function)\n"); | ||
| } | ||
|
|
||
| file = zend_hash_find(Z_ARRVAL_P(tmp), ZSTR_KNOWN(ZEND_STR_FILE)); | ||
| line = zend_hash_find(Z_ARRVAL_P(tmp), ZSTR_KNOWN(ZEND_STR_LINE)); | ||
| zval *file_zv = zend_hash_find(Z_ARRVAL_P(tmp), ZSTR_KNOWN(ZEND_STR_FILE)); |
There was a problem hiding this comment.
Just change this to
file = zend_hash_find_ptr(Z_ARRVAL_P(tmp), ZSTR_KNOWN(ZEND_STR_FILE));
and remove the if-else part.
That makes the code less noisy.
nielsdos
approved these changes
Oct 5, 2024
|
|
||
| zend_hash_internal_pointer_reset_ex(Z_ARRVAL(zbacktrace), &position); | ||
| line = zend_get_executed_lineno(); | ||
| file = zend_get_executed_filename_ex(); |
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.
No description provided.