com php-src: Optimized ucfirst(Avoid duping string if possible): ext/standard/string.c

From: Date: Sun, 06 Aug 2017 06:56:16 +0000
Subject: com php-src: Optimized ucfirst(Avoid duping string if possible): ext/standard/string.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98956@lists.php.net to get a copy of this message
Commit: 6546c516dd61f7f9efecbd9144c02218614d4c51 Author: Xinchen Hui <laruence@gmail.com> Sun, 6 Aug 2017 14:56:16 +0800 Parents: fea7957d0836d8389c4b5063138277d7a21156b3 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6546c516dd61f7f9efecbd9144c02218614d4c51 Log: Optimized ucfirst(Avoid duping string if possible) Changed paths: M ext/standard/string.c Diff: diff --git a/ext/standard/string.c b/ext/standard/string.c index 6ffc2ae..55bcca1 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2789,11 +2789,16 @@ PHP_FUNCTION(chr) /* {{{ php_ucfirst Uppercase the first character of the word in a native string */ -static void php_ucfirst(char *str) +static zend_string* php_ucfirst(zend_string *str) { - register char *r; - r = str; - *r = toupper((unsigned char) *r); + unsigned char r = toupper(ZSTR_VAL(str)[0]); + if (r == ZSTR_VAL(str)[0]) { + return zend_string_copy(str); + } else { + zend_string *s = zend_string_init(ZSTR_VAL(str), ZSTR_LEN(str), 0); + ZSTR_VAL(s)[0] = r; + return s; + } } /* }}} */ @@ -2811,18 +2816,22 @@ PHP_FUNCTION(ucfirst) RETURN_EMPTY_STRING(); } - ZVAL_STRINGL(return_value, ZSTR_VAL(str), ZSTR_LEN(str)); - php_ucfirst(Z_STRVAL_P(return_value)); + RETURN_STR(php_ucfirst(str)); } /* }}} */ /* {{{ Lowercase the first character of the word in a native string */ -static void php_lcfirst(char *str) +static zend_string* php_lcfirst(zend_string *str) { - register char *r; - r = str; - *r = tolower((unsigned char) *r); + unsigned char r = tolower(ZSTR_VAL(str)[0]); + if (r == ZSTR_VAL(str)[0]) { + return zend_string_copy(str); + } else { + zend_string *s = zend_string_init(ZSTR_VAL(str), ZSTR_LEN(str), 0); + ZSTR_VAL(s)[0] = r; + return s; + } } /* }}} */ @@ -2840,8 +2849,7 @@ PHP_FUNCTION(lcfirst) RETURN_EMPTY_STRING(); } - ZVAL_STRINGL(return_value, ZSTR_VAL(str), ZSTR_LEN(str)); - php_lcfirst(Z_STRVAL_P(return_value)); + RETURN_STR(php_lcfirst(str)); } /* }}} */

« previous php.cvs (#98956) next »