diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 13:59:27 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-30 13:59:27 +0300 |
| commit | 7aa7627172c11979ec45c2db85f99182812ee59d (patch) | |
| tree | 90762a1d26b47213a9edd7016a9c45110156e24e /main/php_variables.c | |
| parent | d554d64f649a915b4ecb3a1de409cfc8ff0e9133 (diff) | |
| download | php-git-7aa7627172c11979ec45c2db85f99182812ee59d.tar.gz | |
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index d800a2d3c4..43b00d9322 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -293,8 +293,8 @@ static inline int add_post_vars(zval *arr, post_var_data_t *vars, zend_bool eof) { uint64_t max_vars = PG(max_input_vars); - vars->ptr = vars->str.s->val; - vars->end = vars->str.s->val + vars->str.s->len; + vars->ptr = ZSTR_VAL(vars->str.s); + vars->end = ZSTR_VAL(vars->str.s) + ZSTR_LEN(vars->str.s); while (add_post_var(arr, vars, eof)) { if (++vars->cnt > max_vars) { php_error_docref(NULL, E_WARNING, @@ -306,7 +306,7 @@ static inline int add_post_vars(zval *arr, post_var_data_t *vars, zend_bool eof) } if (!eof) { - memmove(vars->str.s->val, vars->ptr, vars->str.s->len = vars->end - vars->ptr); + memmove(ZSTR_VAL(vars->str.s), vars->ptr, ZSTR_LEN(vars->str.s) = vars->end - vars->ptr); } return SUCCESS; } @@ -640,8 +640,8 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src) Z_ADDREF_P(src_entry); } if (string_key) { - if (!globals_check || string_key->len != sizeof("GLOBALS") - 1 - || memcmp(string_key->val, "GLOBALS", sizeof("GLOBALS") - 1)) { + if (!globals_check || ZSTR_LEN(string_key) != sizeof("GLOBALS") - 1 + || memcmp(ZSTR_VAL(string_key), "GLOBALS", sizeof("GLOBALS") - 1)) { zend_hash_update(dest, string_key, src_entry); } else if (Z_REFCOUNTED_P(src_entry)) { Z_DELREF_P(src_entry); |