diff --git a/ext/standard/string.c b/ext/standard/string.c index 8a223b72f4e..3614e94bace 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -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); } /* }}} */