Various return types and values consolidation (php#19418)

alexandre-daubois · web-flow · commit dfa1307a6411 · 2025-08-12T11:28:41.000+01:00
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -3770,7 +3770,7 @@ static zend_always_inline zend_class_entry *get_scope(zend_execute_data *frame)
 
 static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *scope, zend_execute_data *frame, zend_fcall_info_cache *fcc, bool *strict_class, char **error, bool suppress_deprecation) /* {{{ */
 {
-	bool ret = 0;
+	bool ret = false;
 	zend_class_entry *ce;
 	size_t name_len = ZSTR_LEN(name);
 	zend_string *lcname;
@@ -3795,7 +3795,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 			if (!fcc->object) {
 				fcc->object = zend_get_this_object(frame);
 			}
-			ret = 1;
+			ret = true;
 		}
 	} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_PARENT))) {
 		if (!scope) {
@@ -3815,7 +3815,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 				fcc->object = zend_get_this_object(frame);
 			}
 			*strict_class = 1;
-			ret = 1;
+			ret = true;
 		}
 	} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_STATIC))) {
 		zend_class_entry *called_scope = zend_get_called_scope(frame);
@@ -3832,7 +3832,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 				fcc->object = zend_get_this_object(frame);
 			}
 			*strict_class = 1;
-			ret = 1;
+			ret = true;
 		}
 	} else if ((ce = zend_lookup_class(name)) != NULL) {
 		zend_class_entry *scope = get_scope(frame);
@@ -3852,7 +3852,7 @@ static bool zend_is_callable_check_class(zend_string *name, zend_class_entry *sc
 			fcc->called_scope = fcc->object ? fcc->object->ce : ce;
 		}
 		*strict_class = 1;
-		ret = 1;
+		ret = true;
 	} else {
 		if (error) zend_spprintf(error, 0, "class \"%.*s\" not found", (int)name_len, ZSTR_VAL(name));
 	}
diff --git a/ext/standard/image.c b/ext/standard/image.c
@@ -1198,7 +1198,7 @@ static struct php_gfxinfo *php_handle_avif(php_stream * stream) {
 }
 /* }}} */
 
-/* {{{ php_is_image_avif
+/*
  * Detect whether an image is of type AVIF
  *
  * Only the first "ftyp" box is read.
@@ -1208,12 +1208,8 @@ bool php_is_image_avif(php_stream* stream) {
 	struct php_avif_stream avif_stream;
 	avif_stream.stream = stream;
 
-	if (AvifInfoIdentifyStream(&avif_stream, php_avif_stream_read, php_avif_stream_skip) == kAvifInfoOk) {
-		return 1;
-	}
-	return 0;
+	return AvifInfoIdentifyStream(&avif_stream, php_avif_stream_read, php_avif_stream_skip) == kAvifInfoOk;
 }
-/* }}} */
 
 /* {{{ php_image_type_to_mime_type
  * Convert internal image_type to mime type */
diff --git a/main/php_variables.c b/main/php_variables.c
@@ -346,15 +346,15 @@ static bool add_post_var(zval *arr, post_var_data_t *var, bool eof)
 	size_t new_vlen;
 
 	if (var->ptr >= var->end) {
-		return 0;
+		return false;
 	}
 
 	start = var->ptr + var->already_scanned;
 	vsep = memchr(start, '&', var->end - start);
 	if (!vsep) {
 		if (!eof) {
 			var->already_scanned = var->end - var->ptr;
-			return 0;
+			return false;
 		} else {
 			vsep = var->end;
 		}
@@ -387,10 +387,10 @@ static bool add_post_var(zval *arr, post_var_data_t *var, bool eof)
 
 	var->ptr = vsep + (vsep != var->end);
 	var->already_scanned = 0;
-	return 1;
+	return true;
 }
 
-static inline int add_post_vars(zval *arr, post_var_data_t *vars, bool eof)
+static inline zend_result add_post_vars(zval *arr, post_var_data_t *vars, bool eof)
 {
 	uint64_t max_vars = REQUEST_PARSE_BODY_OPTION_GET(max_input_vars, PG(max_input_vars));
 
@@ -782,7 +782,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src)
 /* }}} */
 
 /* {{{ php_hash_environment */
-PHPAPI int php_hash_environment(void)
+PHPAPI zend_result php_hash_environment(void)
 {
 	memset(PG(http_globals), 0, sizeof(PG(http_globals)));
 	zend_activate_auto_globals();
@@ -805,7 +805,7 @@ static bool php_auto_globals_create_get(zend_string *name)
 	zend_hash_update(&EG(symbol_table), name, &PG(http_globals)[TRACK_VARS_GET]);
 	Z_ADDREF(PG(http_globals)[TRACK_VARS_GET]);
 
-	return 0; /* don't rearm */
+	return false; /* don't rearm */
 }
 
 static bool php_auto_globals_create_post(zend_string *name)
@@ -824,7 +824,7 @@ static bool php_auto_globals_create_post(zend_string *name)
 	zend_hash_update(&EG(symbol_table), name, &PG(http_globals)[TRACK_VARS_POST]);
 	Z_ADDREF(PG(http_globals)[TRACK_VARS_POST]);
 
-	return 0; /* don't rearm */
+	return false; /* don't rearm */
 }
 
 static bool php_auto_globals_create_cookie(zend_string *name)
@@ -839,7 +839,7 @@ static bool php_auto_globals_create_cookie(zend_string *name)
 	zend_hash_update(&EG(symbol_table), name, &PG(http_globals)[TRACK_VARS_COOKIE]);
 	Z_ADDREF(PG(http_globals)[TRACK_VARS_COOKIE]);
 
-	return 0; /* don't rearm */
+	return false; /* don't rearm */
 }
 
 static bool php_auto_globals_create_files(zend_string *name)
@@ -851,7 +851,7 @@ static bool php_auto_globals_create_files(zend_string *name)
 	zend_hash_update(&EG(symbol_table), name, &PG(http_globals)[TRACK_VARS_FILES]);
 	Z_ADDREF(PG(http_globals)[TRACK_VARS_FILES]);
 
-	return 0; /* don't rearm */
+	return false; /* don't rearm */
 }
 
 /* Ugly hack to fix HTTP_PROXY issue, see bug #72573 */
@@ -905,7 +905,7 @@ static bool php_auto_globals_create_server(zend_string *name)
 	 * ignore this issue, as it would probably require larger changes. */
 	HT_ALLOW_COW_VIOLATION(Z_ARRVAL(PG(http_globals)[TRACK_VARS_SERVER]));
 
-	return 0; /* don't rearm */
+	return false; /* don't rearm */
 }
 
 static bool php_auto_globals_create_env(zend_string *name)
@@ -921,7 +921,7 @@ static bool php_auto_globals_create_env(zend_string *name)
 	zend_hash_update(&EG(symbol_table), name, &PG(http_globals)[TRACK_VARS_ENV]);
 	Z_ADDREF(PG(http_globals)[TRACK_VARS_ENV]);
 
-	return 0; /* don't rearm */
+	return false; /* don't rearm */
 }
 
 static bool php_auto_globals_create_request(zend_string *name)
@@ -965,7 +965,7 @@ static bool php_auto_globals_create_request(zend_string *name)
 	}
 
 	zend_hash_update(&EG(symbol_table), name, &form_variables);
-	return 0;
+	return false;
 }
 
 void php_startup_auto_globals(void)
diff --git a/main/php_variables.h b/main/php_variables.h
@@ -39,7 +39,7 @@ PHPAPI void php_register_variable_ex(const char *var, zval *val, zval *track_var
 PHPAPI void php_register_known_variable(const char *var, size_t var_len, zval *value, zval *track_vars_array);
 
 PHPAPI void php_build_argv(const char *s, zval *track_vars_array);
-PHPAPI int php_hash_environment(void);
+PHPAPI zend_result php_hash_environment(void);
 END_EXTERN_C()
 
 #define NUM_TRACK_VARS	6
diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c
@@ -139,7 +139,7 @@ bool phpdbg_check_watch_diff(phpdbg_watchtype type, void *oldPtr, void *newPtr)
 	switch (type) {
 		case WATCH_ON_BUCKET:
 			if (memcmp(&((Bucket *) oldPtr)->h, &((Bucket *) newPtr)->h, sizeof(Bucket) - sizeof(zval) /* hash+key comparison */) != 0) {
-				return 2;
+				return true;
 			}
 			/* Fall through to also compare the value from the bucket. */
 			ZEND_FALLTHROUGH;
@@ -154,7 +154,7 @@ bool phpdbg_check_watch_diff(phpdbg_watchtype type, void *oldPtr, void *newPtr)
 		case WATCH_ON_HASHDATA:
 			ZEND_UNREACHABLE();
 	}
-	return 0;
+	return false;
 }
 
 void phpdbg_print_watch_diff(phpdbg_watchtype type, zend_string *name, void *oldPtr, void *newPtr) {
@@ -280,9 +280,9 @@ static inline void phpdbg_deactivate_watchpoint(phpdbg_watchpoint_t *watch) {
 
 /* Note that consecutive pages need to be merged in order to avoid watchpoints spanning page boundaries to have part of their data in the one page, part in the other page */
 #ifdef _WIN32
-int phpdbg_watchpoint_segfault_handler(void *addr) {
+zend_result phpdbg_watchpoint_segfault_handler(void *addr) {
 #else
-int phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context) {
+zend_result phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context) {
 #endif
 
 	void *page = phpdbg_get_page_boundary(
@@ -562,12 +562,12 @@ bool phpdbg_is_recursively_watched(void *ptr, phpdbg_watch_element *element) {
 	do {
 		element = next;
 		if (element->watch->addr.ptr == ptr) {
-			return 1;
+			return true;
 		}
 		next = element->parent;
 	} while (!(element->flags & PHPDBG_WATCH_RECURSIVE_ROOT));
 
-	return 0;
+	return false;
 }
 
 void phpdbg_add_recursive_watch_from_ht(phpdbg_watch_element *element, zend_long idx, zend_string *str, zval *zv) {
@@ -721,7 +721,7 @@ bool phpdbg_try_re_adding_watch_element(zval *parent, phpdbg_watch_element *elem
 	HashTable *ht = HT_FROM_ZVP(parent);
 
 	if (!ht) {
-		return 0;
+		return false;
 	} else if (element->flags & (PHPDBG_WATCH_ARRAY | PHPDBG_WATCH_OBJECT)) {
 		char *htPtr = ((char *) ht) + HT_WATCH_OFFSET;
 		char *oldPtr = ((char *) &element->backup.ht) + HT_WATCH_OFFSET;
@@ -742,7 +742,7 @@ bool phpdbg_try_re_adding_watch_element(zval *parent, phpdbg_watch_element *elem
 			}
 
 			if (!phpdbg_try_re_adding_watch_element(next, element->child)) {
-				return 0;
+				return false;
 			}
 		} else if (phpdbg_check_watch_diff(WATCH_ON_ZVAL, &element->backup.zv, zv)) {
 			phpdbg_print_watch_diff(WATCH_ON_ZVAL, element->str, &element->backup.zv, zv);
@@ -752,10 +752,10 @@ bool phpdbg_try_re_adding_watch_element(zval *parent, phpdbg_watch_element *elem
 		phpdbg_add_bucket_watch_element((Bucket *) zv, element);
 		phpdbg_watch_parent_ht(element);
 	} else {
-		return 0;
+		return false;
 	}
 
-	return 1;
+	return true;
 }
 
 void phpdbg_automatic_dequeue_free(phpdbg_watch_element *element) {
diff --git a/sapi/phpdbg/phpdbg_watch.h b/sapi/phpdbg/phpdbg_watch.h
@@ -115,9 +115,9 @@ void phpdbg_destroy_watchpoints(void);
 void phpdbg_purge_watchpoint_tree(void);
 
 #ifndef _WIN32
-int phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context);
+zend_result phpdbg_watchpoint_segfault_handler(siginfo_t *info, void *context);
 #else
-int phpdbg_watchpoint_segfault_handler(void *addr);
+zend_result phpdbg_watchpoint_segfault_handler(void *addr);
 #endif
 
 void phpdbg_create_addr_watchpoint(void *addr, size_t size, phpdbg_watchpoint_t *watch);

Original file line number	Diff line number	Diff line change
`@@ -3770,7 +3770,7 @@ static zend_always_inline zend_class_entry get_scope(zend_execute_data frame)`
`3770`	`3770`
`3771`	`3771`	`static bool zend_is_callable_check_class(zend_string name, zend_class_entry scope, zend_execute_data frame, zend_fcall_info_cache fcc, bool strict_class, char error, bool suppress_deprecation) / {{{ */`
`3772`	`3772`	`{`
`3773`		`- bool ret = 0;`
	`3773`	`+ bool ret = false;`
`3774`	`3774`	`zend_class_entry *ce;`
`3775`	`3775`	`size_t name_len = ZSTR_LEN(name);`
`3776`	`3776`	`zend_string *lcname;`
`@@ -3795,7 +3795,7 @@ static bool zend_is_callable_check_class(zend_string name, zend_class_entry sc`
`3795`	`3795`	`if (!fcc->object) {`
`3796`	`3796`	`fcc->object = zend_get_this_object(frame);`
`3797`	`3797`	`}`
`3798`		`- ret = 1;`
	`3798`	`+ ret = true;`
`3799`	`3799`	`}`
`3800`	`3800`	`} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_PARENT))) {`
`3801`	`3801`	`if (!scope) {`
`@@ -3815,7 +3815,7 @@ static bool zend_is_callable_check_class(zend_string name, zend_class_entry sc`
`3815`	`3815`	`fcc->object = zend_get_this_object(frame);`
`3816`	`3816`	`}`
`3817`	`3817`	`*strict_class = 1;`
`3818`		`- ret = 1;`
	`3818`	`+ ret = true;`
`3819`	`3819`	`}`
`3820`	`3820`	`} else if (zend_string_equals(lcname, ZSTR_KNOWN(ZEND_STR_STATIC))) {`
`3821`	`3821`	`zend_class_entry *called_scope = zend_get_called_scope(frame);`
`@@ -3832,7 +3832,7 @@ static bool zend_is_callable_check_class(zend_string name, zend_class_entry sc`
`3832`	`3832`	`fcc->object = zend_get_this_object(frame);`
`3833`	`3833`	`}`
`3834`	`3834`	`*strict_class = 1;`
`3835`		`- ret = 1;`
	`3835`	`+ ret = true;`
`3836`	`3836`	`}`
`3837`	`3837`	`} else if ((ce = zend_lookup_class(name)) != NULL) {`
`3838`	`3838`	`zend_class_entry *scope = get_scope(frame);`
`@@ -3852,7 +3852,7 @@ static bool zend_is_callable_check_class(zend_string name, zend_class_entry sc`
`3852`	`3852`	`fcc->called_scope = fcc->object ? fcc->object->ce : ce;`
`3853`	`3853`	`}`
`3854`	`3854`	`*strict_class = 1;`
`3855`		`- ret = 1;`
	`3855`	`+ ret = true;`
`3856`	`3856`	`} else {`
`3857`	`3857`	`if (error) zend_spprintf(error, 0, "class \"%.*s\" not found", (int)name_len, ZSTR_VAL(name));`
`3858`	`3858`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1198,7 +1198,7 @@ static struct php_gfxinfo php_handle_avif(php_stream stream) {`
`1198`	`1198`	`}`
`1199`	`1199`	`/* }}} */`
`1200`	`1200`
`1201`		`-/* {{{ php_is_image_avif`
	`1201`	`+/*`
`1202`	`1202`	`* Detect whether an image is of type AVIF`
`1203`	`1203`	`*`
`1204`	`1204`	`* Only the first "ftyp" box is read.`
`@@ -1208,12 +1208,8 @@ bool php_is_image_avif(php_stream* stream) {`
`1208`	`1208`	`struct php_avif_stream avif_stream;`
`1209`	`1209`	`avif_stream.stream = stream;`
`1210`	`1210`
`1211`		`- if (AvifInfoIdentifyStream(&avif_stream, php_avif_stream_read, php_avif_stream_skip) == kAvifInfoOk) {`
`1212`		`- return 1;`
`1213`		`- }`
`1214`		`- return 0;`
	`1211`	`+ return AvifInfoIdentifyStream(&avif_stream, php_avif_stream_read, php_avif_stream_skip) == kAvifInfoOk;`
`1215`	`1212`	`}`
`1216`		`-/* }}} */`
`1217`	`1213`
`1218`	`1214`	`/* {{{ php_image_type_to_mime_type`
`1219`	`1215`	`* Convert internal image_type to mime type */`