Naming: input -> userinput

Author: arnaud-lb

Zend/zend_alloc.c

@@ -2698,7 +2698,7 @@ ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap *heap, void *ptr
 
 typedef struct _zend_alloc_globals {
 	zend_mm_heap *mm_heap;
-	uint32_t      use_input_zone;
+	uint32_t      use_userinput_zone;
 } zend_alloc_globals;
 
 #ifdef ZTS
@@ -2711,7 +2711,7 @@ static zend_alloc_globals alloc_globals;
 #endif
 
 #if ZEND_MM_HEAP_PROTECTION
-# define ZEND_MM_ZONE_INPUT 1
+# define ZEND_MM_ZONE_USERINPUT 1
 #endif
 
 ZEND_API bool is_zend_mm(void)
@@ -2762,28 +2762,28 @@ ZEND_API bool is_zend_ptr(const void *ptr)
 	return 0;
 }
 
-ZEND_API void zend_mm_input_begin(void)
+ZEND_API void zend_mm_userinput_begin(void)
 {
 #if ZEND_MM_HEAP_PROTECTION
-	AG(use_input_zone)++;
-	AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_INPUT);
+	AG(use_userinput_zone)++;
+	AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_USERINPUT);
 #endif
 }
 
-ZEND_API void zend_mm_input_end(void)
+ZEND_API void zend_mm_userinput_end(void)
 {
 #if ZEND_MM_HEAP_PROTECTION
-	AG(use_input_zone)--;
-	if (!AG(use_input_zone)) {
+	AG(use_userinput_zone)--;
+	if (!AG(use_userinput_zone)) {
 		AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_DEFAULT);
 	}
 #endif
 }
 
-ZEND_API bool zend_mm_check_in_input(void)
+ZEND_API bool zend_mm_check_in_userinput(void)
 {
 #if ZEND_MM_HEAP_PROTECTION
-	return AG(use_input_zone);
+	return AG(use_userinput_zone);
 #else
 	return true;
 #endif
@@ -3086,9 +3086,9 @@ ZEND_API void shutdown_memory_manager(bool silent, bool full_shutdown)
 	zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
 
 	if (!full_shutdown) {
-		ZEND_ASSERT(AG(use_input_zone) == 0 || silent);
-		AG(use_input_zone) = 0;
-		zend_mm_input_begin();
+		ZEND_ASSERT(AG(use_userinput_zone) == 0 || silent);
+		AG(use_userinput_zone) = 0;
+		zend_mm_userinput_begin();
 	}
 }
 
@@ -3193,7 +3193,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
 {
 	char *tmp;
 
-	alloc_globals->use_input_zone = 0;
+	alloc_globals->use_userinput_zone = 0;
 
 #if ZEND_MM_CUSTOM
 	tmp = getenv("USE_ZEND_ALLOC");

Zend/zend_alloc.h

@@ -222,9 +222,9 @@ ZEND_API void start_memory_manager(void);
 ZEND_API void shutdown_memory_manager(bool silent, bool full_shutdown);
 ZEND_API bool is_zend_mm(void);
 ZEND_API bool is_zend_ptr(const void *ptr);
-ZEND_API void zend_mm_input_begin(void);
-ZEND_API void zend_mm_input_end(void);
-ZEND_API bool zend_mm_check_in_input(void);
+ZEND_API void zend_mm_userinput_begin(void);
+ZEND_API void zend_mm_userinput_end(void);
+ZEND_API bool zend_mm_check_in_userinput(void);
 
 ZEND_API size_t zend_memory_usage(bool real_usage);
 ZEND_API size_t zend_memory_peak_usage(bool real_usage);

Zend/zend_compile.c

@@ -1974,9 +1974,9 @@ ZEND_API bool zend_is_auto_global_str(const char *name, size_t len) /* {{{ */ {
 
 	if ((auto_global = zend_hash_str_find_ptr(CG(auto_globals), name, len)) != NULL) {
 		if (auto_global->armed) {
-			zend_mm_input_begin();
+			zend_mm_userinput_begin();
 			auto_global->armed = auto_global->auto_global_callback(auto_global->name);
-			zend_mm_input_end();
+			zend_mm_userinput_end();
 		}
 		return 1;
 	}
@@ -1990,9 +1990,9 @@ ZEND_API bool zend_is_auto_global(zend_string *name) /* {{{ */
 
 	if ((auto_global = zend_hash_find_ptr(CG(auto_globals), name)) != NULL) {
 		if (auto_global->armed) {
-			zend_mm_input_begin();
+			zend_mm_userinput_begin();
 			auto_global->armed = auto_global->auto_global_callback(auto_global->name);
-			zend_mm_input_end();
+			zend_mm_userinput_end();
 		}
 		return 1;
 	}
@@ -2019,7 +2019,7 @@ ZEND_API void zend_activate_auto_globals(void) /* {{{ */
 {
 	zend_auto_global *auto_global;
 
-	ZEND_ASSERT(zend_mm_check_in_input());
+	ZEND_ASSERT(zend_mm_check_in_userinput());
 
 	ZEND_HASH_MAP_FOREACH_PTR(CG(auto_globals), auto_global) {
 		if (auto_global->jit) {

ext/opcache/ZendAccelerator.c

@@ -4641,7 +4641,7 @@ static zend_result accel_finish_startup_preload(bool in_child)
 	orig_error_reporting = EG(error_reporting);
 	EG(error_reporting) = 0;
 
-	zend_mm_input_begin();
+	zend_mm_userinput_begin();
 	const zend_result rc = php_request_startup();
 
 	EG(error_reporting) = orig_error_reporting;

main/main.c

@@ -1802,7 +1802,7 @@ zend_result php_request_startup(void)
 {
 	zend_result retval = SUCCESS;
 
-	ZEND_ASSERT(zend_mm_check_in_input());
+	ZEND_ASSERT(zend_mm_check_in_userinput());
 
 	zend_interned_strings_activate();
 
@@ -1879,7 +1879,7 @@ zend_result php_request_startup(void)
 
 	SG(sapi_started) = 1;
 
-	zend_mm_input_end();
+	zend_mm_userinput_end();
 
 	return retval;
 }