Use RETURN_STR_COPY in mb_output_handler

alexdowad · alexdowad · commit 4f36623c1e71 · 2023-01-22T13:53:04.000+02:00
This means the same thing and makes the code read a tiny bit better.

Thanks to Nikita Popov for the tip.
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
@@ -1534,7 +1534,7 @@ PHP_FUNCTION(mb_output_handler)
 
 	const mbfl_encoding *encoding = MBSTRG(current_http_output_encoding);
 	if (encoding == &mbfl_encoding_pass) {
-		RETURN_STR(zend_string_copy(str));
+		RETURN_STR_COPY(str);
 	}
 
 	if (arg_status & PHP_OUTPUT_HANDLER_START) {
@@ -1574,7 +1574,7 @@ PHP_FUNCTION(mb_output_handler)
 	}
 
 	if (!MBSTRG(outconv_enabled)) {
-		RETURN_STR(zend_string_copy(str));
+		RETURN_STR_COPY(str);
 	}
 
 	mb_convert_buf buf;

Original file line number	Diff line number	Diff line change
`@@ -1534,7 +1534,7 @@ PHP_FUNCTION(mb_output_handler)`
`1534`	`1534`
`1535`	`1535`	`const mbfl_encoding *encoding = MBSTRG(current_http_output_encoding);`
`1536`	`1536`	`if (encoding == &mbfl_encoding_pass) {`
`1537`		`- RETURN_STR(zend_string_copy(str));`
	`1537`	`+ RETURN_STR_COPY(str);`
`1538`	`1538`	`}`
`1539`	`1539`
`1540`	`1540`	`if (arg_status & PHP_OUTPUT_HANDLER_START) {`
`@@ -1574,7 +1574,7 @@ PHP_FUNCTION(mb_output_handler)`
`1574`	`1574`	`}`
`1575`	`1575`
`1576`	`1576`	`if (!MBSTRG(outconv_enabled)) {`
`1577`		`- RETURN_STR(zend_string_copy(str));`
	`1577`	`+ RETURN_STR_COPY(str);`
`1578`	`1578`	`}`
`1579`	`1579`
`1580`	`1580`	`mb_convert_buf buf;`