diff options
| author | Yiduo (David) Wang <davidw@php.net> | 2007-10-07 05:15:07 +0000 |
|---|---|---|
| committer | Yiduo (David) Wang <davidw@php.net> | 2007-10-07 05:15:07 +0000 |
| commit | 95da0dc5700ee9d41f1e5664c8167cd37023dbd3 (patch) | |
| tree | e4c6288af1a3f260bbd705c83c397741233d60ea /ext/standard/var.c | |
| parent | d20f6ecac8e2db5b0595c4fdef4cae221594ab88 (diff) | |
| download | php-git-95da0dc5700ee9d41f1e5664c8167cd37023dbd3.tar.gz | |
Added macros for managing zval refcounts and is_ref statuses
Diffstat (limited to 'ext/standard/var.c')
| -rw-r--r-- | ext/standard/var.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index abed4afc2f..3168e3dcbd 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -33,8 +33,7 @@ #include "basic_functions.h" #include "php_incomplete_class.h" -#define COMMON ((*struc)->is_ref ? "&" : "") -#define Z_REFCOUNT_PP(a) ((*a)->refcount) +#define COMMON (Z_ISREF_PP(struc) ? "&" : "") /* }}} */ @@ -676,7 +675,7 @@ static inline int php_add_var_hash(HashTable *var_hash, zval *var, void *var_old } if (var_old && zend_hash_find(var_hash, p, len, var_old) == SUCCESS) { - if (!var->is_ref) { + if (!Z_ISREF_P(var)) { /* we still need to bump up the counter, since non-refs will be counted separately by unserializer */ var_no = -1; @@ -904,7 +903,7 @@ static void php_var_serialize_intern(smart_str *buf, zval *struc, HashTable *var if (var_hash && php_add_var_hash(var_hash, struc, (void *) &var_already TSRMLS_CC) == FAILURE) { - if(struc->is_ref) { + if(Z_ISREF_P(struc)) { smart_str_appendl(buf, "R:", 2); smart_str_append_long(buf, *var_already); smart_str_appendc(buf, ';'); |