Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 35a17c9

Browse files
Naming: input -> userinput
1 parent b9f761d commit 35a17c9

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎Zend/zend_alloc.c‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2698,7 +2698,7 @@ ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap *heap, void *ptr
26982698

26992699
typedef struct _zend_alloc_globals {
27002700
zend_mm_heap *mm_heap;
2701-
uint32_t use_input_zone;
2701+
uint32_t use_userinput_zone;
27022702
} zend_alloc_globals;
27032703

27042704
#ifdef ZTS
@@ -2711,7 +2711,7 @@ static zend_alloc_globals alloc_globals;
27112711
#endif
27122712

27132713
#if ZEND_MM_HEAP_PROTECTION
2714-
# define ZEND_MM_ZONE_INPUT 1
2714+
# define ZEND_MM_ZONE_USERINPUT 1
27152715
#endif
27162716

27172717
ZEND_API bool is_zend_mm(void)
@@ -2762,28 +2762,28 @@ ZEND_API bool is_zend_ptr(const void *ptr)
27622762
return 0;
27632763
}
27642764

2765-
ZEND_API void zend_mm_input_begin(void)
2765+
ZEND_API void zend_mm_userinput_begin(void)
27662766
{
27672767
#if ZEND_MM_HEAP_PROTECTION
2768-
AG(use_input_zone)++;
2769-
AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_INPUT);
2768+
AG(use_userinput_zone)++;
2769+
AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_USERINPUT);
27702770
#endif
27712771
}
27722772

2773-
ZEND_API void zend_mm_input_end(void)
2773+
ZEND_API void zend_mm_userinput_end(void)
27742774
{
27752775
#if ZEND_MM_HEAP_PROTECTION
2776-
AG(use_input_zone)--;
2777-
if (!AG(use_input_zone)) {
2776+
AG(use_userinput_zone)--;
2777+
if (!AG(use_userinput_zone)) {
27782778
AG(mm_heap)->zone_free_slot = ZEND_MM_ZONE_FREE_SLOT(AG(mm_heap), ZEND_MM_ZONE_DEFAULT);
27792779
}
27802780
#endif
27812781
}
27822782

2783-
ZEND_API bool zend_mm_check_in_input(void)
2783+
ZEND_API bool zend_mm_check_in_userinput(void)
27842784
{
27852785
#if ZEND_MM_HEAP_PROTECTION
2786-
return AG(use_input_zone);
2786+
return AG(use_userinput_zone);
27872787
#else
27882788
return true;
27892789
#endif
@@ -3086,9 +3086,9 @@ ZEND_API void shutdown_memory_manager(bool silent, bool full_shutdown)
30863086
zend_mm_shutdown(AG(mm_heap), full_shutdown, silent);
30873087

30883088
if (!full_shutdown) {
3089-
ZEND_ASSERT(AG(use_input_zone) == 0 || silent);
3090-
AG(use_input_zone) = 0;
3091-
zend_mm_input_begin();
3089+
ZEND_ASSERT(AG(use_userinput_zone) == 0 || silent);
3090+
AG(use_userinput_zone) = 0;
3091+
zend_mm_userinput_begin();
30923092
}
30933093
}
30943094

@@ -3193,7 +3193,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
31933193
{
31943194
char *tmp;
31953195

3196-
alloc_globals->use_input_zone = 0;
3196+
alloc_globals->use_userinput_zone = 0;
31973197

31983198
#if ZEND_MM_CUSTOM
31993199
tmp = getenv("USE_ZEND_ALLOC");

‎Zend/zend_alloc.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -222,9 +222,9 @@ ZEND_API void start_memory_manager(void);
222222
ZEND_API void shutdown_memory_manager(bool silent, bool full_shutdown);
223223
ZEND_API bool is_zend_mm(void);
224224
ZEND_API bool is_zend_ptr(const void *ptr);
225-
ZEND_API void zend_mm_input_begin(void);
226-
ZEND_API void zend_mm_input_end(void);
227-
ZEND_API bool zend_mm_check_in_input(void);
225+
ZEND_API void zend_mm_userinput_begin(void);
226+
ZEND_API void zend_mm_userinput_end(void);
227+
ZEND_API bool zend_mm_check_in_userinput(void);
228228

229229
ZEND_API size_t zend_memory_usage(bool real_usage);
230230
ZEND_API size_t zend_memory_peak_usage(bool real_usage);

‎Zend/zend_compile.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1974,9 +1974,9 @@ ZEND_API bool zend_is_auto_global_str(const char *name, size_t len) /* {{{ */ {
19741974

19751975
if ((auto_global = zend_hash_str_find_ptr(CG(auto_globals), name, len)) != NULL) {
19761976
if (auto_global->armed) {
1977-
zend_mm_input_begin();
1977+
zend_mm_userinput_begin();
19781978
auto_global->armed = auto_global->auto_global_callback(auto_global->name);
1979-
zend_mm_input_end();
1979+
zend_mm_userinput_end();
19801980
}
19811981
return 1;
19821982
}
@@ -1990,9 +1990,9 @@ ZEND_API bool zend_is_auto_global(zend_string *name) /* {{{ */
19901990

19911991
if ((auto_global = zend_hash_find_ptr(CG(auto_globals), name)) != NULL) {
19921992
if (auto_global->armed) {
1993-
zend_mm_input_begin();
1993+
zend_mm_userinput_begin();
19941994
auto_global->armed = auto_global->auto_global_callback(auto_global->name);
1995-
zend_mm_input_end();
1995+
zend_mm_userinput_end();
19961996
}
19971997
return 1;
19981998
}
@@ -2019,7 +2019,7 @@ ZEND_API void zend_activate_auto_globals(void) /* {{{ */
20192019
{
20202020
zend_auto_global *auto_global;
20212021

2022-
ZEND_ASSERT(zend_mm_check_in_input());
2022+
ZEND_ASSERT(zend_mm_check_in_userinput());
20232023

20242024
ZEND_HASH_MAP_FOREACH_PTR(CG(auto_globals), auto_global) {
20252025
if (auto_global->jit) {

‎ext/opcache/ZendAccelerator.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4641,7 +4641,7 @@ static zend_result accel_finish_startup_preload(bool in_child)
46414641
orig_error_reporting = EG(error_reporting);
46424642
EG(error_reporting) = 0;
46434643

4644-
zend_mm_input_begin();
4644+
zend_mm_userinput_begin();
46454645
const zend_result rc = php_request_startup();
46464646

46474647
EG(error_reporting) = orig_error_reporting;

‎main/main.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1802,7 +1802,7 @@ zend_result php_request_startup(void)
18021802
{
18031803
zend_result retval = SUCCESS;
18041804

1805-
ZEND_ASSERT(zend_mm_check_in_input());
1805+
ZEND_ASSERT(zend_mm_check_in_userinput());
18061806

18071807
zend_interned_strings_activate();
18081808

@@ -1879,7 +1879,7 @@ zend_result php_request_startup(void)
18791879

18801880
SG(sapi_started) = 1;
18811881

1882-
zend_mm_input_end();
1882+
zend_mm_userinput_end();
18831883

18841884
return retval;
18851885
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /