diff options
| author | Andi Gutmans <andi@php.net> | 2001-06-19 16:03:35 +0000 |
|---|---|---|
| committer | Andi Gutmans <andi@php.net> | 2001-06-19 16:03:35 +0000 |
| commit | c977f298626e98aefcbdd77d04f1cba58d4d6590 (patch) | |
| tree | b16e135dce4798e0bcc934d52d7921ecf1308c9d /ext/rpc | |
| parent | e4f109b69fd2b5976d018f1064a772e34352de91 (diff) | |
| download | php-git-c977f298626e98aefcbdd77d04f1cba58d4d6590.tar.gz | |
- Use ALLOC_HASHTABLE() instead of emalloc(sizeof(HashTable))
Diffstat (limited to 'ext/rpc')
| -rw-r--r-- | ext/rpc/com/com_wrapper.c | 4 | ||||
| -rw-r--r-- | ext/rpc/com/conversion.c | 4 | ||||
| -rw-r--r-- | ext/rpc/java/java.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c index 15d0ec8e34..ce9201e144 100644 --- a/ext/rpc/com/com_wrapper.c +++ b/ext/rpc/com/com_wrapper.c @@ -1184,7 +1184,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer return_value.type = IS_OBJECT; return_value.value.obj.ce = &com_class_entry; - return_value.value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); + ALLOC_HASHTABLE(return_value.value.obj.properties); zend_hash_init(return_value.value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); ALLOC_ZVAL(handle); @@ -1225,7 +1225,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer return_value.type = IS_OBJECT; return_value.value.obj.ce = &com_class_entry; - return_value.value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); + ALLOC_HASHTABLE(return_value.value.obj.properties); zend_hash_init(return_value.value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); ALLOC_ZVAL(handle); diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c index 92d1a2511d..d6eb0d286e 100644 --- a/ext/rpc/com/conversion.c +++ b/ext/rpc/com/conversion.c @@ -746,7 +746,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, Z_TYPE_P(pval_arg) = IS_OBJECT; pval_arg->value.obj.ce = &com_class_entry; - pval_arg->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); + ALLOC_HASHTABLE(pval_arg->value.obj.properties); zend_hash_init(pval_arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); ALLOC_ZVAL(handle); @@ -886,4 +886,4 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per return C_str; } -#endif /* PHP_WIN32 */
\ No newline at end of file +#endif /* PHP_WIN32 */ diff --git a/ext/rpc/java/java.c b/ext/rpc/java/java.c index e8cb96a83f..27bfc1e14c 100644 --- a/ext/rpc/java/java.c +++ b/ext/rpc/java/java.c @@ -713,7 +713,7 @@ JNIEXPORT void JNICALL Java_net_php_reflect_setResultFromObject if (presult->type != IS_OBJECT) { presult->type=IS_OBJECT; presult->value.obj.ce=&java_class_entry; - presult->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); + ALLOC_HASHTABLE(presult->value.obj.properties); presult->is_ref=1; presult->refcount=1; zend_hash_init(presult->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); |