diff options
| author | Yiduo (David) Wang <davidw@php.net> | 2007-10-07 05:22:07 +0000 |
|---|---|---|
| committer | Yiduo (David) Wang <davidw@php.net> | 2007-10-07 05:22:07 +0000 |
| commit | 4b4d634cb956de1efc13c8ed9b243fe1a85f783b (patch) | |
| tree | eaa8d691de244aff3ee68fd3c23f769f02fa4446 /ext/soap/soap.c | |
| parent | ca4c55ad3a673257925bd9b458683c4f0e60e755 (diff) | |
| download | php-git-4b4d634cb956de1efc13c8ed9b243fe1a85f783b.tar.gz | |
MFH: Added macros for managing zval refcounts and is_ref statuses
Diffstat (limited to 'ext/soap/soap.c')
| -rw-r--r-- | ext/soap/soap.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 0024b03743..69e7226ab1 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -2379,7 +2379,7 @@ PHP_METHOD(SoapClient, SoapClient) INIT_PZVAL(class_map); zval_copy_ctor(class_map); #ifdef ZEND_ENGINE_2 - class_map->refcount--; + Z_DELREF_P(class_map); #endif add_property_zval(this_ptr, "_classmap", class_map); } @@ -2795,7 +2795,7 @@ PHP_METHOD(SoapClient, __call) soap_headers = emalloc(sizeof(HashTable)); zend_hash_init(soap_headers, 0, NULL, ZVAL_PTR_DTOR, 0); zend_hash_next_index_insert(soap_headers, &headers, sizeof(zval*), NULL); - ZVAL_ADDREF(headers); + Z_ADDREF_P(headers); free_soap_headers = 1; } else{ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid SOAP header"); @@ -2814,7 +2814,7 @@ PHP_METHOD(SoapClient, __call) } zend_hash_internal_pointer_reset(default_headers); while (zend_hash_get_current_data(default_headers, (void**)&tmp) == SUCCESS) { - ZVAL_ADDREF(*tmp); + Z_ADDREF_PP(tmp); zend_hash_next_index_insert(soap_headers, tmp, sizeof(zval *), NULL); zend_hash_move_forward(default_headers); } @@ -3060,9 +3060,9 @@ PHP_METHOD(SoapClient, __setSoapHeaders) zval *default_headers; ALLOC_INIT_ZVAL(default_headers); array_init(default_headers); - headers->refcount++; + Z_ADDREF_P(headers); add_next_index_zval(default_headers, headers); - default_headers->refcount--; + Z_DELREF_P(default_headers); add_property_zval(this_ptr, "__default_headers", default_headers); } else{ php_error_docref(NULL TSRMLS_CC, E_ERROR, "Invalid SOAP header"); @@ -3152,7 +3152,7 @@ zval* add_soap_fault(zval *obj, char *fault_code, char *fault_string, char *faul ALLOC_INIT_ZVAL(fault); set_soap_fault(fault, NULL, fault_code, fault_string, fault_actor, fault_detail, NULL TSRMLS_CC); #ifdef ZEND_ENGINE_2 - fault->refcount--; + Z_DELREF_P(fault); #endif add_property_zval(obj, "__soap_fault", fault); return fault; |