ext/opcache: use bool type instead of int

Girgias · Girgias · commit 1b651dbc9e66 · 2025-10-13T13:55:04.000+01:00
diff --git a/ext/opcache/zend_accelerator_hash.c b/ext/opcache/zend_accelerator_hash.c
@@ -138,7 +138,7 @@ zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash *accel_hash, zend_
 	return entry;
 }
 
-static zend_always_inline void* zend_accel_hash_find_ex(const zend_accel_hash *accel_hash, zend_string *key, int data)
+static zend_always_inline void* zend_accel_hash_find_ex(const zend_accel_hash *accel_hash, zend_string *key, bool data)
 {
 	zend_ulong index;
 	zend_accel_hash_entry *entry;
@@ -178,15 +178,15 @@ static zend_always_inline void* zend_accel_hash_find_ex(const zend_accel_hash *a
  */
 void* zend_accel_hash_find(const zend_accel_hash *accel_hash, zend_string *key)
 {
-	return zend_accel_hash_find_ex(accel_hash, key, 1);
+	return zend_accel_hash_find_ex(accel_hash, key, true);
 }
 
 /* Returns the hash entry associated with key on success
  * Returns NULL if it doesn't exist
  */
 zend_accel_hash_entry* zend_accel_hash_find_entry(const zend_accel_hash *accel_hash, zend_string *key)
 {
-	return (zend_accel_hash_entry *)zend_accel_hash_find_ex(accel_hash, key, 0);
+	return (zend_accel_hash_entry *)zend_accel_hash_find_ex(accel_hash, key, false);
 }
 
 int zend_accel_hash_unlink(zend_accel_hash *accel_hash, zend_string *key)
diff --git a/ext/opcache/zend_accelerator_module.c b/ext/opcache/zend_accelerator_module.c
@@ -62,7 +62,7 @@ static zif_handler orig_file_exists = NULL;
 static zif_handler orig_is_file = NULL;
 static zif_handler orig_is_readable = NULL;
 
-static int validate_api_restriction(void)
+static bool validate_api_restriction(void)
 {
 	if (ZCG(accel_directives).restrict_api && *ZCG(accel_directives).restrict_api) {
 		size_t len = strlen(ZCG(accel_directives).restrict_api);
@@ -71,10 +71,10 @@ static int validate_api_restriction(void)
 		    strlen(SG(request_info).path_translated) < len ||
 		    memcmp(SG(request_info).path_translated, ZCG(accel_directives).restrict_api, len) != 0) {
 			zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " API is restricted by \"restrict_api\" configuration directive");
-			return 0;
+			return false;
 		}
 	}
-	return 1;
+	return true;
 }
 
 static ZEND_INI_MH(OnUpdateMemoryConsumption)
@@ -178,8 +178,8 @@ static ZEND_INI_MH(OnEnable)
 			}
 			return FAILURE;
 		} else {
-			*p = 0;
-			ZCG(accelerator_enabled) = 0;
+			*p = false;
+			ZCG(accelerator_enabled) = false;
 			return SUCCESS;
 		}
 	}
@@ -363,7 +363,7 @@ ZEND_INI_BEGIN()
 #endif
 ZEND_INI_END()
 
-static int filename_is_in_cache(zend_string *filename)
+static bool filename_is_in_cache(zend_string *filename)
 {
 	zend_string *key;
 
@@ -373,27 +373,26 @@ static int filename_is_in_cache(zend_string *filename)
 		if (persistent_script && !persistent_script->corrupted) {
 			if (ZCG(accel_directives).validate_timestamps) {
 				zend_file_handle handle;
-				int ret;
+				bool ret;
 
 				zend_stream_init_filename_ex(&handle, filename);
-				ret = validate_timestamp_and_record_ex(persistent_script, &handle) == SUCCESS
-					? 1 : 0;
+				ret = validate_timestamp_and_record_ex(persistent_script, &handle) == SUCCESS;
 				zend_destroy_file_handle(&handle);
 				return ret;
 			}
 
-			return 1;
+			return true;
 		}
 	}
 
-	return 0;
+	return false;
 }
 
-static int filename_is_in_file_cache(zend_string *filename)
+static bool filename_is_in_file_cache(zend_string *filename)
 {
 	zend_string *realpath = zend_resolve_path(filename);
 	if (!realpath) {
-		return 0;
+		return false;
 	}
 
 	zend_file_handle handle;
@@ -406,7 +405,7 @@ static int filename_is_in_file_cache(zend_string *filename)
 	return result != NULL;
 }
 
-static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)
+static bool accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)
 {
 	if (ZEND_NUM_ARGS() == 1) {
 		zval *zv = ZEND_CALL_ARG(execute_data , 1);
@@ -415,7 +414,7 @@ static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)
 			return filename_is_in_cache(Z_STR_P(zv));
 		}
 	}
-	return 0;
+	return false;
 }
 
 static ZEND_NAMED_FUNCTION(accel_file_exists)
diff --git a/ext/opcache/zend_accelerator_util_funcs.c b/ext/opcache/zend_accelerator_util_funcs.c
@@ -47,7 +47,7 @@ zend_persistent_script* create_persistent_script(void)
 	return persistent_script;
 }
 
-void free_persistent_script(zend_persistent_script *persistent_script, int destroy_elements)
+void free_persistent_script(zend_persistent_script *persistent_script, bool destroy_elements)
 {
 	if (!destroy_elements) {
 		/* Both the keys and values have been transferred into the global tables.
@@ -358,7 +358,7 @@ static void zend_accel_do_delayed_early_binding(
 	CG(in_compilation) = orig_in_compilation;
 }
 
-zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, int from_shared_memory)
+zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, bool from_shared_memory)
 {
 	zend_op_array *op_array;
 
diff --git a/ext/opcache/zend_accelerator_util_funcs.h b/ext/opcache/zend_accelerator_util_funcs.h
@@ -28,15 +28,15 @@
 BEGIN_EXTERN_C()
 
 zend_persistent_script* create_persistent_script(void);
-void free_persistent_script(zend_persistent_script *persistent_script, int destroy_elements);
+void free_persistent_script(zend_persistent_script *persistent_script, bool destroy_elements);
 
 void zend_accel_move_user_functions(HashTable *str, uint32_t count, zend_script *script);
 void zend_accel_move_user_classes(HashTable *str, uint32_t count, zend_script *script);
 void zend_accel_build_delayed_early_binding_list(zend_persistent_script *persistent_script);
 void zend_accel_finalize_delayed_early_binding_list(const zend_persistent_script *persistent_script);
 void zend_accel_free_delayed_early_binding_list(zend_persistent_script *persistent_script);
 
-zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, int from_shared_memory);
+zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, bool from_shared_memory);
 
 #define ADLER32_INIT 1     /* initial Adler-32 value */
 
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -1421,7 +1421,7 @@ static zend_early_binding *zend_persist_early_bindings(
 	return early_bindings;
 }
 
-zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, int for_shm)
+zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, bool for_shm)
 {
 	Bucket *p;
 
diff --git a/ext/opcache/zend_persist.h b/ext/opcache/zend_persist.h
@@ -24,8 +24,8 @@
 
 BEGIN_EXTERN_C()
 
-uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, int for_shm);
-zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, int for_shm);
+uint32_t zend_accel_script_persist_calc(zend_persistent_script *script, bool for_shm);
+zend_persistent_script *zend_accel_script_persist(zend_persistent_script *script, bool for_shm);
 
 void zend_persist_class_entry_calc(zend_class_entry *ce);
 zend_class_entry *zend_persist_class_entry(zend_class_entry *ce);
diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
@@ -629,7 +629,7 @@ static void zend_persist_early_bindings_calc(
 	}
 }
 
-uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, int for_shm)
+uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, bool for_shm)
 {
 	Bucket *p;
 

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ zend_accel_hash_entry* zend_accel_hash_update(zend_accel_hash *accel_hash, zend_`
`138`	`138`	`return entry;`
`139`	`139`	`}`
`140`	`140`
`141`		`-static zend_always_inline void* zend_accel_hash_find_ex(const zend_accel_hash accel_hash, zend_string key, int data)`
	`141`	`+static zend_always_inline void* zend_accel_hash_find_ex(const zend_accel_hash accel_hash, zend_string key, bool data)`
`142`	`142`	`{`
`143`	`143`	`zend_ulong index;`
`144`	`144`	`zend_accel_hash_entry *entry;`
`@@ -178,15 +178,15 @@ static zend_always_inline void* zend_accel_hash_find_ex(const zend_accel_hash *a`
`178`	`178`	`*/`
`179`	`179`	`void* zend_accel_hash_find(const zend_accel_hash accel_hash, zend_string key)`
`180`	`180`	`{`
`181`		`- return zend_accel_hash_find_ex(accel_hash, key, 1);`
	`181`	`+ return zend_accel_hash_find_ex(accel_hash, key, true);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`/* Returns the hash entry associated with key on success`
`185`	`185`	`* Returns NULL if it doesn't exist`
`186`	`186`	`*/`
`187`	`187`	`zend_accel_hash_entry* zend_accel_hash_find_entry(const zend_accel_hash accel_hash, zend_string key)`
`188`	`188`	`{`
`189`		`- return (zend_accel_hash_entry *)zend_accel_hash_find_ex(accel_hash, key, 0);`
	`189`	`+ return (zend_accel_hash_entry *)zend_accel_hash_find_ex(accel_hash, key, false);`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`int zend_accel_hash_unlink(zend_accel_hash accel_hash, zend_string key)`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ static zif_handler orig_file_exists = NULL;`
`62`	`62`	`static zif_handler orig_is_file = NULL;`
`63`	`63`	`static zif_handler orig_is_readable = NULL;`
`64`	`64`
`65`		`-static int validate_api_restriction(void)`
	`65`	`+static bool validate_api_restriction(void)`
`66`	`66`	`{`
`67`	`67`	`if (ZCG(accel_directives).restrict_api && *ZCG(accel_directives).restrict_api) {`
`68`	`68`	`size_t len = strlen(ZCG(accel_directives).restrict_api);`
`@@ -71,10 +71,10 @@ static int validate_api_restriction(void)`
`71`	`71`	`strlen(SG(request_info).path_translated) < len \|\|`
`72`	`72`	`memcmp(SG(request_info).path_translated, ZCG(accel_directives).restrict_api, len) != 0) {`
`73`	`73`	`zend_error(E_WARNING, ACCELERATOR_PRODUCT_NAME " API is restricted by \"restrict_api\" configuration directive");`
`74`		`- return 0;`
	`74`	`+ return false;`
`75`	`75`	`}`
`76`	`76`	`}`
`77`		`- return 1;`
	`77`	`+ return true;`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`static ZEND_INI_MH(OnUpdateMemoryConsumption)`
`@@ -178,8 +178,8 @@ static ZEND_INI_MH(OnEnable)`
`178`	`178`	`}`
`179`	`179`	`return FAILURE;`
`180`	`180`	`} else {`
`181`		`- *p = 0;`
`182`		`- ZCG(accelerator_enabled) = 0;`
	`181`	`+ *p = false;`
	`182`	`+ ZCG(accelerator_enabled) = false;`
`183`	`183`	`return SUCCESS;`
`184`	`184`	`}`
`185`	`185`	`}`
`@@ -363,7 +363,7 @@ ZEND_INI_BEGIN()`
`363`	`363`	`#endif`
`364`	`364`	`ZEND_INI_END()`
`365`	`365`
`366`		`-static int filename_is_in_cache(zend_string *filename)`
	`366`	`+static bool filename_is_in_cache(zend_string *filename)`
`367`	`367`	`{`
`368`	`368`	`zend_string *key;`
`369`	`369`
`@@ -373,27 +373,26 @@ static int filename_is_in_cache(zend_string *filename)`
`373`	`373`	`if (persistent_script && !persistent_script->corrupted) {`
`374`	`374`	`if (ZCG(accel_directives).validate_timestamps) {`
`375`	`375`	`zend_file_handle handle;`
`376`		`- int ret;`
	`376`	`+ bool ret;`
`377`	`377`
`378`	`378`	`zend_stream_init_filename_ex(&handle, filename);`
`379`		`- ret = validate_timestamp_and_record_ex(persistent_script, &handle) == SUCCESS`
`380`		`- ? 1 : 0;`
	`379`	`+ ret = validate_timestamp_and_record_ex(persistent_script, &handle) == SUCCESS;`
`381`	`380`	`zend_destroy_file_handle(&handle);`
`382`	`381`	`return ret;`
`383`	`382`	`}`
`384`	`383`
`385`		`- return 1;`
	`384`	`+ return true;`
`386`	`385`	`}`
`387`	`386`	`}`
`388`	`387`
`389`		`- return 0;`
	`388`	`+ return false;`
`390`	`389`	`}`
`391`	`390`
`392`		`-static int filename_is_in_file_cache(zend_string *filename)`
	`391`	`+static bool filename_is_in_file_cache(zend_string *filename)`
`393`	`392`	`{`
`394`	`393`	`zend_string *realpath = zend_resolve_path(filename);`
`395`	`394`	`if (!realpath) {`
`396`		`- return 0;`
	`395`	`+ return false;`
`397`	`396`	`}`
`398`	`397`
`399`	`398`	`zend_file_handle handle;`
`@@ -406,7 +405,7 @@ static int filename_is_in_file_cache(zend_string *filename)`
`406`	`405`	`return result != NULL;`
`407`	`406`	`}`
`408`	`407`
`409`		`-static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)`
	`408`	`+static bool accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)`
`410`	`409`	`{`
`411`	`410`	`if (ZEND_NUM_ARGS() == 1) {`
`412`	`411`	`zval *zv = ZEND_CALL_ARG(execute_data , 1);`
`@@ -415,7 +414,7 @@ static int accel_file_in_cache(INTERNAL_FUNCTION_PARAMETERS)`
`415`	`414`	`return filename_is_in_cache(Z_STR_P(zv));`
`416`	`415`	`}`
`417`	`416`	`}`
`418`		`- return 0;`
	`417`	`+ return false;`
`419`	`418`	`}`
`420`	`419`
`421`	`420`	`static ZEND_NAMED_FUNCTION(accel_file_exists)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ zend_persistent_script* create_persistent_script(void)`
`47`	`47`	`return persistent_script;`
`48`	`48`	`}`
`49`	`49`
`50`		`-void free_persistent_script(zend_persistent_script *persistent_script, int destroy_elements)`
	`50`	`+void free_persistent_script(zend_persistent_script *persistent_script, bool destroy_elements)`
`51`	`51`	`{`
`52`	`52`	`if (!destroy_elements) {`
`53`	`53`	`/* Both the keys and values have been transferred into the global tables.`
`@@ -358,7 +358,7 @@ static void zend_accel_do_delayed_early_binding(`
`358`	`358`	`CG(in_compilation) = orig_in_compilation;`
`359`	`359`	`}`
`360`	`360`
`361`		`-zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, int from_shared_memory)`
	`361`	`+zend_op_array* zend_accel_load_script(zend_persistent_script *persistent_script, bool from_shared_memory)`
`362`	`362`	`{`
`363`	`363`	`zend_op_array *op_array;`
`364`	`364`
Original file line number	Diff line number	Diff line change
`@@ -1421,7 +1421,7 @@ static zend_early_binding *zend_persist_early_bindings(`
`1421`	`1421`	`return early_bindings;`
`1422`	`1422`	`}`
`1423`	`1423`
`1424`		`-zend_persistent_script zend_accel_script_persist(zend_persistent_script script, int for_shm)`
	`1424`	`+zend_persistent_script zend_accel_script_persist(zend_persistent_script script, bool for_shm)`
`1425`	`1425`	`{`
`1426`	`1426`	`Bucket *p;`
`1427`	`1427`
Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ static void zend_persist_early_bindings_calc(`
`629`	`629`	`}`
`630`	`630`	`}`
`631`	`631`
`632`		`-uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, int for_shm)`
	`632`	`+uint32_t zend_accel_script_persist_calc(zend_persistent_script *new_persistent_script, bool for_shm)`
`633`	`633`	`{`
`634`	`634`	`Bucket *p;`
`635`	`635`