Skip to content

Shadowing warning #16461

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

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Shadowing warning #16461

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e209191
Zend: Add -Wshadow warning
Girgias Oct 16, 2024
56e744f
Add pragmas
Girgias Oct 16, 2024
359db14
Prevent some variable shadowing
Girgias Oct 16, 2024
4d84ce3
Fix variable shadowing in array_column()
Girgias Oct 16, 2024
19f9836
Use zend_return type where appropriate
Girgias Oct 16, 2024
8f78cc5
sapi/cli: Use explicit -1 value to check failure of I/O function
Girgias Oct 16, 2024
3f4313f
Add some const qualifiers
Girgias Oct 16, 2024
fed84e3
ext/standard/var: Minor refactoring
Girgias Oct 16, 2024
7e0b2ab
Revert "Zend: Add -Wshadow warning"
Girgias Oct 16, 2024
557fea1
Revert zend_operator
Girgias Oct 17, 2024
feb3800
Revert zend_execute.c
Girgias Oct 17, 2024
3fcd0b1
Revert language scanner
Girgias Oct 17, 2024
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
Prev Previous commit
Revert language scanner
  • Loading branch information
@Girgias
Girgias committed Oct 17, 2024
commit 3fcd0b10718584b0d6c1d7c539aabd22c1ea360f
6 changes: 3 additions & 3 deletions Zend/zend_language_scanner.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,12 +1124,12 @@ static zend_result zend_scan_escape_string(zval *zendlval, char *str, int len, c
skip_escape_conversion:
if (SCNG(output_filter)) {
size_t sz = 0;
unsigned char *output_str;
unsigned char *str;
// TODO: avoid realocation ???
s = Z_STRVAL_P(zendlval);
SCNG(output_filter)(&output_str, &sz, (unsigned char *)s, (size_t)Z_STRLEN_P(zendlval));
SCNG(output_filter)(&str, &sz, (unsigned char *)s, (size_t)Z_STRLEN_P(zendlval));
zval_ptr_dtor(zendlval);
ZVAL_STRINGL(zendlval, (char *) output_str, sz);
ZVAL_STRINGL(zendlval, (char *) str, sz);
efree(str);
}
return SUCCESS;
Expand Down