diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-09-29 11:17:43 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-29 11:17:43 +0300 |
| commit | 560e4fa39327e952652b6469d9644fc5fa2c15fa (patch) | |
| tree | b91589369c569d8efe84785303b58ad0fdd17c18 /main | |
| parent | 617bef558bbc8e2dd7682d9f407963b4a88092eb (diff) | |
| download | php-git-560e4fa39327e952652b6469d9644fc5fa2c15fa.tar.gz | |
Removed or simplified incorrect SEPARATE_*() macros usage.
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_variables.c | 2 | ||||
| -rw-r--r-- | main/streams/userspace.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 173d6b075d..2dac0ed0ea 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -649,7 +649,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src) zend_hash_index_update(dest, num_key, src_entry); } } else { - SEPARATE_ZVAL(dest_entry); + SEPARATE_ARRAY(dest_entry); php_autoglobal_merge(Z_ARRVAL_P(dest_entry), Z_ARRVAL_P(src_entry)); } } ZEND_HASH_FOREACH_END(); diff --git a/main/streams/userspace.c b/main/streams/userspace.c index b73db20d40..9bbf5b0c4e 100644 --- a/main/streams/userspace.c +++ b/main/streams/userspace.c @@ -840,9 +840,7 @@ static int statbuf_from_array(zval *array, php_stream_statbuf *ssb) #define STAT_PROP_ENTRY_EX(name, name2) \ if (NULL != (elem = zend_hash_str_find(Z_ARRVAL_P(array), #name, sizeof(#name)-1))) { \ - SEPARATE_ZVAL(elem); \ - convert_to_long(elem); \ - ssb->sb.st_##name2 = Z_LVAL_P(elem); \ + ssb->sb.st_##name2 = zval_get_long(elem); \ } #define STAT_PROP_ENTRY(name) STAT_PROP_ENTRY_EX(name,name) |