Minor updates on types

Author: alexandre-daubois

main/main.c

@@ -1010,7 +1010,7 @@ PHPAPI ZEND_COLD void php_verror(const char *docref, const char *params, int typ
 	const char *space = "";
 	const char *class_name = "";
 	const char *function;
-	int origin_len;
+	size_t origin_len;
 	char *origin;
 	zend_string *message;
 	int is_function = 0;
@@ -2093,13 +2093,13 @@ void dummy_invalid_parameter_handler(
 		unsigned int   line,
 		uintptr_t      pReserved)
 {
-	static int called = 0;
+	static bool called = false;
 	char buf[1024];
 	int len;
 
 	if (!called) {
 			if(PG(windows_show_crt_warning)) {
-			called = 1;
+			called = true;
 			if (function) {
 				if (file) {
 					len = _snprintf(buf, sizeof(buf)-1, "Invalid parameter detected in CRT function '%ws' (%ws:%u)", function, file, line);
@@ -2110,7 +2110,7 @@ void dummy_invalid_parameter_handler(
 				len = _snprintf(buf, sizeof(buf)-1, "Invalid CRT parameter detected (function not known)");
 			}
 			zend_error(E_WARNING, "%s", buf);
-			called = 0;
+			called = false;
 		}
 	}
 }

main/php_content_types.c

@@ -41,20 +41,17 @@ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader)
 /* }}} */
 
 /* {{{ php_startup_sapi_content_types */
-int php_startup_sapi_content_types(void)
+void php_startup_sapi_content_types(void)
 {
 	sapi_register_default_post_reader(php_default_post_reader);
 	sapi_register_treat_data(php_default_treat_data);
 	sapi_register_input_filter(php_default_input_filter, NULL);
-	return SUCCESS;
 }
 /* }}} */
 
 /* {{{ php_setup_sapi_content_types */
-int php_setup_sapi_content_types(void)
+void php_setup_sapi_content_types(void)
 {
 	sapi_register_post_entries(php_post_entries);
-
-	return SUCCESS;
 }
 /* }}} */

main/php_content_types.h

@@ -21,7 +21,7 @@
 
 SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader);
 SAPI_API SAPI_POST_HANDLER_FUNC(php_std_post_handler);
-int php_startup_sapi_content_types(void);
-int php_setup_sapi_content_types(void);
+void php_startup_sapi_content_types(void);
+void php_setup_sapi_content_types(void);
 
 #endif /* PHP_CONTENT_TYPES_H */