Refactor php_mb_ulcfirst

Author: youkidearitai

ext/mbstring/mbstring.c

@@ -2953,22 +2953,7 @@ PHP_FUNCTION(mb_strtolower)
 	RETURN_STR(mbstring_convert_case(PHP_UNICODE_CASE_LOWER, ZSTR_VAL(str), ZSTR_LEN(str), enc));
 }
 
-static zend_string* php_mb_ulcfirst(zend_string *str, php_case_mode mode, const mbfl_encoding *enc)
-{
-	zend_string *first, *second, *head;
-	first = mb_get_substr(str, 0, 1, enc);
-	second = mb_get_substr(str, 1, MBFL_SUBSTR_UNTIL_END, enc);
-	head = mbstring_convert_case(mode, ZSTR_VAL(first), ZSTR_LEN(first), enc);
-	zend_string_release_ex(first, false);
-
-	zend_string *retval = zend_string_concat2(ZSTR_VAL(head), ZSTR_LEN(head), ZSTR_VAL(second), ZSTR_LEN(second));
-	zend_string_release_ex(head, false);
-	zend_string_release_ex(second, false);
-
-	return retval;
-}
-
-PHP_FUNCTION(mb_ucfirst)
+static void php_mb_ulcfirst(INTERNAL_FUNCTION_PARAMETERS, php_case_mode mode)
 {
 	zend_string *str, *from_encoding = NULL;
 
@@ -2983,25 +2968,26 @@ PHP_FUNCTION(mb_ucfirst)
 		RETURN_THROWS();
 	}
 
-	RETVAL_STR(php_mb_ulcfirst(str, PHP_UNICODE_CASE_TITLE, enc));
-}
+	zend_string *first = mb_get_substr(str, 0, 1, enc);
+	zend_string *second = mb_get_substr(str, 1, MBFL_SUBSTR_UNTIL_END, enc);
+	zend_string *head = mbstring_convert_case(mode, ZSTR_VAL(first), ZSTR_LEN(first), enc);
+	zend_string_release_ex(first, false);
 
-PHP_FUNCTION(mb_lcfirst)
-{
-	zend_string *str, *from_encoding = NULL;
+	zend_string *retval = zend_string_concat2(ZSTR_VAL(head), ZSTR_LEN(head), ZSTR_VAL(second), ZSTR_LEN(second));
+	zend_string_release_ex(head, false);
+	zend_string_release_ex(second, false);
 
-	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_STR(str)
-		Z_PARAM_OPTIONAL
-		Z_PARAM_STR_OR_NULL(from_encoding)
-	ZEND_PARSE_PARAMETERS_END();
+	RETVAL_STR(retval);
+}
 
-	const mbfl_encoding *enc = php_mb_get_encoding(from_encoding, 2);
-	if (!enc) {
-		RETURN_THROWS();
-	}
+PHP_FUNCTION(mb_ucfirst)
+{
+	php_mb_ulcfirst(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_UNICODE_CASE_TITLE);
+}
 
-	RETVAL_STR(php_mb_ulcfirst(str, PHP_UNICODE_CASE_LOWER, enc));
+PHP_FUNCTION(mb_lcfirst)
+{
+	php_mb_ulcfirst(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_UNICODE_CASE_LOWER);
 }
 
 typedef enum {