Skip to content

Commit e948d3c

Browse files
committed
Use zend_string_to(upper|lower)() API directly
1 parent 71a110f commit e948d3c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

ext/standard/array.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4529,9 +4529,9 @@ PHP_FUNCTION(array_change_key_case)
45294529
entry = zend_hash_index_update(Z_ARRVAL_P(return_value), num_key, entry);
45304530
} else {
45314531
if (change_to_upper) {
4532-
new_key = php_string_toupper(string_key);
4532+
new_key = zend_string_toupper(string_key);
45334533
} else {
4534-
new_key = php_string_tolower(string_key);
4534+
new_key = zend_string_tolower(string_key);
45354535
}
45364536
entry = zend_hash_update(Z_ARRVAL_P(return_value), new_key, entry);
45374537
zend_string_release_ex(new_key, 0);

ext/standard/string.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3120,7 +3120,7 @@ static zend_string *php_str_to_str_i_ex(zend_string *haystack, const char *lc_ha
31203120
char *e;
31213121

31223122
if (ZSTR_LEN(needle) == str_len) {
3123-
lc_needle = php_string_tolower(needle);
3123+
lc_needle = zend_string_tolower(needle);
31243124
end = lc_haystack + ZSTR_LEN(haystack);
31253125
for (p = lc_haystack; (r = (char*)php_memnstr(p, ZSTR_VAL(lc_needle), ZSTR_LEN(lc_needle), end)); p = r + ZSTR_LEN(lc_needle)) {
31263126
if (!new_str) {
@@ -3141,7 +3141,7 @@ static zend_string *php_str_to_str_i_ex(zend_string *haystack, const char *lc_ha
31413141
const char *n;
31423142
const char *endp = o + ZSTR_LEN(haystack);
31433143

3144-
lc_needle = php_string_tolower(needle);
3144+
lc_needle = zend_string_tolower(needle);
31453145
n = ZSTR_VAL(lc_needle);
31463146

31473147
while ((o = (char*)php_memnstr(o, n, ZSTR_LEN(lc_needle), endp))) {
@@ -3185,7 +3185,7 @@ static zend_string *php_str_to_str_i_ex(zend_string *haystack, const char *lc_ha
31853185
nothing_todo:
31863186
return zend_string_copy(haystack);
31873187
} else {
3188-
lc_needle = php_string_tolower(needle);
3188+
lc_needle = zend_string_tolower(needle);
31893189

31903190
if (memcmp(lc_haystack, ZSTR_VAL(lc_needle), ZSTR_LEN(lc_needle))) {
31913191
zend_string_release_ex(lc_needle, 0);

0 commit comments

Comments
 (0)