diff options
| author | Felipe Pena <felipe@php.net> | 2009-12-08 01:57:37 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2009-12-08 01:57:37 +0000 |
| commit | a94558c855ed4a9a53b3b2db226884a26bff6d4e (patch) | |
| tree | dd06c337d767f8a20e6b4bb4fc697022f80af276 /ext/soap | |
| parent | a9044795da419e0002ac9ab5a3ce8f96c6de0323 (diff) | |
| download | php-git-a94558c855ed4a9a53b3b2db226884a26bff6d4e.tar.gz | |
- Added MAKE_COPY_ZVAL(ppzv, pzv) macro
Diffstat (limited to 'ext/soap')
| -rw-r--r-- | ext/soap/soap.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c index 59d13fa527..5ad8e569c6 100644 --- a/ext/soap/soap.c +++ b/ext/soap/soap.c @@ -1416,9 +1416,7 @@ PHP_METHOD(SoapServer, setObject) service->type = SOAP_OBJECT; MAKE_STD_ZVAL(service->soap_object); - *service->soap_object = *obj; - zval_copy_ctor(service->soap_object); - INIT_PZVAL(service->soap_object); + MAKE_COPY_ZVAL(&obj, service->soap_object); SOAP_SERVER_END_CODE(); } @@ -2335,9 +2333,7 @@ static void soap_error_handler(int error_num, const char *error_filename, const } fault = add_soap_fault(SOAP_GLOBAL(error_object), code, buffer, NULL, NULL TSRMLS_CC); MAKE_STD_ZVAL(exception); - *exception = *fault; - zval_copy_ctor(exception); - INIT_PZVAL(exception); + MAKE_COPY_ZVAL(&fault, exception); zend_throw_exception_object(exception TSRMLS_CC); old_objects = EG(objects_store).object_buckets; @@ -2623,9 +2619,7 @@ PHP_METHOD(SoapClient, SoapClient) zval *class_map; MAKE_STD_ZVAL(class_map); - *class_map = **tmp; - INIT_PZVAL(class_map); - zval_copy_ctor(class_map); + MAKE_COPY_ZVAL(tmp, class_map); #ifdef ZEND_ENGINE_2 Z_DELREF_P(class_map); #endif @@ -2955,9 +2949,7 @@ static void do_soap_call(zval* this_ptr, zval *exception; MAKE_STD_ZVAL(exception); - *exception = *return_value; - zval_copy_ctor(exception); - INIT_PZVAL(exception); + MAKE_COPY_ZVAL(&return_value, exception); zend_throw_exception_object(exception TSRMLS_CC); } #endif |