diff options
| author | Zeev Suraski <zeev@php.net> | 2001-07-31 05:44:11 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-07-31 05:44:11 +0000 |
| commit | aa1772ca7263173ee47af0d83fea866f194757ba (patch) | |
| tree | a8ea8932a07875a43423a8ffcd0100eab0c0f8a7 /ext/rpc | |
| parent | 57507b4ea6bb2a38578444ca8359806f241fa8f5 (diff) | |
| download | php-git-aa1772ca7263173ee47af0d83fea866f194757ba.tar.gz | |
More TSRMLS_FETCH annihilation
Diffstat (limited to 'ext/rpc')
| -rw-r--r-- | ext/rpc/com/com_wrapper.c | 3 | ||||
| -rw-r--r-- | ext/rpc/com/variant.c | 4 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 10 |
3 files changed, 10 insertions, 7 deletions
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c index a9d18cec9f..cb60f4d2a8 100644 --- a/ext/rpc/com/com_wrapper.c +++ b/ext/rpc/com/com_wrapper.c @@ -335,9 +335,10 @@ static char *php_string_from_clsid(const CLSID *clsid) return clsid_str; } -static void php_comval_destructor(zend_rsrc_list_entry *rsrc) +static void php_comval_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { comval *obj = (comval *)rsrc->ptr; + if(C_ISREFD(obj)) { C_REFCOUNT(obj) = 1; diff --git a/ext/rpc/com/variant.c b/ext/rpc/com/variant.c index af435bacbd..8f9ebd0e2d 100644 --- a/ext/rpc/com/variant.c +++ b/ext/rpc/com/variant.c @@ -42,7 +42,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper pval php_VARIANT_get_property_handler(zend_property_reference *property_reference); static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value); void php_register_VARIANT_class(); -static void php_variant_destructor(zend_rsrc_list_entry *rsrc); +static void php_variant_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC); void php_register_VARIANT_class(); static int le_variant; @@ -423,7 +423,7 @@ static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value) return SUCCESS; } -static void php_variant_destructor(zend_rsrc_list_entry *rsrc) +static void php_variant_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { efree(rsrc); } diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index fd9d77b2ae..be030e3f80 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -592,15 +592,17 @@ int java_set_property_handler /***************************************************************************/ -static void _php_java_destructor(zend_rsrc_list_entry *rsrc) +static void _php_java_destructor(zend_rsrc_list_entry *rsrc TSRMLS_DC) { void *jobject = (void *)rsrc->ptr; - JG_FETCH(); - if (JG(jenv)) (*JG(jenv))->DeleteGlobalRef(JG(jenv), jobject); + + JG_FETCH(); + if (JG(jenv)) (*JG(jenv))->DeleteGlobalRef(JG(jenv), jobject); } #ifdef ZTS -static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) { +static void alloc_java_globals_ctor(php_java_globals *java_globals TSRMLS_DC) +{ memset(java_globals, 0, sizeof(php_java_globals)); } #endif |