Use zend_return type where appropriate

Girgias · Girgias · commit 7e25257fd3ad · 2024-10-17T00:34:36.000+01:00
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
@@ -1767,7 +1767,6 @@ PHP_FUNCTION(highlight_file)
 {
 	char *filename;
 	size_t filename_len;
-	int ret;
 	zend_syntax_highlighter_ini syntax_highlighter_ini_ptr;
 	bool i = 0;
 
@@ -1787,7 +1786,7 @@ PHP_FUNCTION(highlight_file)
 
 	php_get_highlight_struct(&syntax_highlighter_ini_ptr);
 
-	ret = highlight_file(filename, &syntax_highlighter_ini_ptr);
+	zend_result ret = highlight_file(filename, &syntax_highlighter_ini_ptr);
 
 	if (ret == FAILURE) {
 		if (i) {
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
@@ -510,7 +510,7 @@ const zend_function_entry server_additional_functions[] = {
 	PHP_FE_END
 };
 
-static int sapi_cli_server_startup(sapi_module_struct *sapi_module_to_start) /* {{{ */
+static zend_result sapi_cli_server_startup(sapi_module_struct *sapi_module_to_start) /* {{{ */
 {
 	return php_module_startup(sapi_module_to_start, &cli_server_module_entry);
 } /* }}} */

Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ const zend_function_entry server_additional_functions[] = {`
`510`	`510`	`PHP_FE_END`
`511`	`511`	`};`
`512`	`512`
`513`		`-static int sapi_cli_server_startup(sapi_module_struct sapi_module_to_start) / {{{ */`
	`513`	`+static zend_result sapi_cli_server_startup(sapi_module_struct sapi_module_to_start) / {{{ */`
`514`	`514`	`{`
`515`	`515`	`return php_module_startup(sapi_module_to_start, &cli_server_module_entry);`
`516`	`516`	`} /* }}} */`