rename 'try' to 'allow_not_found' to avoid conflict with c++ reserverd word

oplanre · oplanre · commit 747f90ea9321 · 2024-08-04T13:35:03.000-06:00
diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c
@@ -286,7 +286,7 @@ static ZEND_NAMED_FUNCTION(zend_enum_cases_func)
 	} ZEND_HASH_FOREACH_END();
 }
 
-ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_class_entry *ce, zend_long long_key, zend_string *string_key, bool try)
+ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_class_entry *ce, zend_long long_key, zend_string *string_key, bool allow_not_found)
 {
 	if (ce->type == ZEND_USER_CLASS && !(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {
 		if (zend_update_class_constants(ce) == FAILURE) {
@@ -310,7 +310,7 @@ ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_clas
 
 	if (case_name_zv == NULL) {
 not_found:
-		if (try) {
+		if (allow_not_found) {
 			*result = NULL;
 			return SUCCESS;
 		}
diff --git a/Zend/zend_enum.h b/Zend/zend_enum.h
@@ -44,7 +44,7 @@ ZEND_API void zend_enum_add_case(zend_class_entry *ce, zend_string *case_name, z
 ZEND_API void zend_enum_add_case_cstr(zend_class_entry *ce, const char *name, zval *value);
 ZEND_API zend_object *zend_enum_get_case(zend_class_entry *ce, zend_string *name);
 ZEND_API zend_object *zend_enum_get_case_cstr(zend_class_entry *ce, const char *name);
-ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_class_entry *ce, zend_long long_key, zend_string *string_key, bool try);
+ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_class_entry *ce, zend_long long_key, zend_string *string_key, bool allow_not_found);
 
 static zend_always_inline zval *zend_enum_fetch_case_name(zend_object *zobj)
 {

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ static ZEND_NAMED_FUNCTION(zend_enum_cases_func)`
`286`	`286`	`} ZEND_HASH_FOREACH_END();`
`287`	`287`	`}`
`288`	`288`
`289`		`-ZEND_API zend_result zend_enum_get_case_by_value(zend_object *result, zend_class_entry ce, zend_long long_key, zend_string *string_key, bool try)`
	`289`	`+ZEND_API zend_result zend_enum_get_case_by_value(zend_object *result, zend_class_entry ce, zend_long long_key, zend_string *string_key, bool allow_not_found)`
`290`	`290`	`{`
`291`	`291`	`if (ce->type == ZEND_USER_CLASS && !(ce->ce_flags & ZEND_ACC_CONSTANTS_UPDATED)) {`
`292`	`292`	`if (zend_update_class_constants(ce) == FAILURE) {`
`@@ -310,7 +310,7 @@ ZEND_API zend_result zend_enum_get_case_by_value(zend_object **result, zend_clas`
`310`	`310`
`311`	`311`	`if (case_name_zv == NULL) {`
`312`	`312`	`not_found:`
`313`		`- if (try) {`
	`313`	`+ if (allow_not_found) {`
`314`	`314`	`*result = NULL;`
`315`	`315`	`return SUCCESS;`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ ZEND_API void zend_enum_add_case(zend_class_entry ce, zend_string case_name, z`
`44`	`44`	`ZEND_API void zend_enum_add_case_cstr(zend_class_entry ce, const char name, zval *value);`
`45`	`45`	`ZEND_API zend_object zend_enum_get_case(zend_class_entry ce, zend_string *name);`
`46`	`46`	`ZEND_API zend_object zend_enum_get_case_cstr(zend_class_entry ce, const char *name);`
`47`		`-ZEND_API zend_result zend_enum_get_case_by_value(zend_object *result, zend_class_entry ce, zend_long long_key, zend_string *string_key, bool try);`
	`47`	`+ZEND_API zend_result zend_enum_get_case_by_value(zend_object *result, zend_class_entry ce, zend_long long_key, zend_string *string_key, bool allow_not_found);`
`48`	`48`
`49`	`49`	`static zend_always_inline zval zend_enum_fetch_case_name(zend_object zobj)`
`50`	`50`	`{`