Skip to content

Update basic functions to new parameter parsing API #2565

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

Closed
wants to merge 3 commits into from
Closed

Update basic functions to new parameter parsing API #2565

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99c0220
Updating to new parameter parsing API
Fleshgrinder Jun 7, 2017
3f3e5b3
Revert "Updating to new parameter parsing API"
Fleshgrinder Jun 7, 2017
4d042ed
Updated str functions to new API
Fleshgrinder Jun 7, 2017
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
30 changes: 18 additions & 12 deletions Zend/zend_builtin_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,9 +532,10 @@ ZEND_FUNCTION(strcmp)
{
zend_string *s1, *s2;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &s1, &s2) == FAILURE) {
return;
}
ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STR(s1)
Z_PARAM_STR(s2)
ZEND_PARSE_PARAMETERS_END();

RETURN_LONG(zend_binary_strcmp(ZSTR_VAL(s1), ZSTR_LEN(s1), ZSTR_VAL(s2), ZSTR_LEN(s2)));
}
Expand All @@ -547,9 +548,11 @@ ZEND_FUNCTION(strncmp)
zend_string *s1, *s2;
zend_long len;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSl", &s1, &s2, &len) == FAILURE) {
return;
}
ZEND_PARSE_PARAMETERS_START(3, 3)
Z_PARAM_STR(s1)
Z_PARAM_STR(s2)
Z_PARAM_LONG(len)
ZEND_PARSE_PARAMETERS_END();

if (len < 0) {
zend_error(E_WARNING, "Length must be greater than or equal to 0");
Expand All @@ -566,9 +569,10 @@ ZEND_FUNCTION(strcasecmp)
{
zend_string *s1, *s2;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "SS", &s1, &s2) == FAILURE) {
return;
}
ZEND_PARSE_PARAMETERS_START(2, 2)
Z_PARAM_STR(s1)
Z_PARAM_STR(s2)
ZEND_PARSE_PARAMETERS_END();

RETURN_LONG(zend_binary_strcasecmp(ZSTR_VAL(s1), ZSTR_LEN(s1), ZSTR_VAL(s2), ZSTR_LEN(s2)));
}
Expand All @@ -581,9 +585,11 @@ ZEND_FUNCTION(strncasecmp)
zend_string *s1, *s2;
zend_long len;

if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSl", &s1, &s2, &len) == FAILURE) {
return;
}
ZEND_PARSE_PARAMETERS_START(3, 3)
Z_PARAM_STR(s1)
Z_PARAM_STR(s2)
Z_PARAM_LONG(len)
ZEND_PARSE_PARAMETERS_END();

if (len < 0) {
zend_error(E_WARNING, "Length must be greater than or equal to 0");
Expand Down