php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-27 01:32:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't use else after return in php_string_tolower()

Browse Source
This commit is contained in:
Nikita Popov
2021-09-28 09:43:13 +02:00
parent 7fa4127974
commit 1441271f18
1 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
ext/standard/string.c
View File

@@ -1421,36 +1421,32 @@ PHPAPI char *php_strtolower(char *s, size_t len)
/* {{{ php_string_tolower */
PHPAPI zend_string *php_string_tolower(zend_string *s)
{
unsigned char *c;
const unsigned char *e;
if (EXPECTED(!BG(ctype_string))) {
return zend_string_tolower(s);
} else {
c = (unsigned char *)ZSTR_VAL(s);
e = c + ZSTR_LEN(s);
while (c < e) {
if (isupper(*c)) {
unsigned char *r;
zend_string *res = zend_string_alloc(ZSTR_LEN(s), 0);
if (c != (unsigned char*)ZSTR_VAL(s)) {
memcpy(ZSTR_VAL(res), ZSTR_VAL(s), c - (unsigned char*)ZSTR_VAL(s));
}
r = c + (ZSTR_VAL(res) - ZSTR_VAL(s));
while (c < e) {
*r = tolower(*c);
r++;
c++;
}
*r = '\0';
return res;
}
c++;
}
return zend_string_copy(s);
}
unsigned char *c = (unsigned char *)ZSTR_VAL(s);
const unsigned char *e = c + ZSTR_LEN(s);
while (c < e) {
if (isupper(*c)) {
unsigned char *r;
zend_string *res = zend_string_alloc(ZSTR_LEN(s), 0);
if (c != (unsigned char*)ZSTR_VAL(s)) {
memcpy(ZSTR_VAL(res), ZSTR_VAL(s), c - (unsigned char*)ZSTR_VAL(s));
}
r = c + (ZSTR_VAL(res) - ZSTR_VAL(s));
while (c < e) {
*r = tolower(*c);
r++;
c++;
}
*r = '\0';
return res;
}
c++;
}
return zend_string_copy(s);
}
/* }}} */