cvs: /php4 main.c /php4/ext/com COM.c /php4/ext/java java.c /php4/ext/standard array.c browscap.c var.c

andrei Tue Dec 21 12:15:03 1999 EDT Modified files: /php4 main.c /php4/ext/com COM.c /php4/ext/java java.c /php4/ext/standard array.c browscap.c var.c Log: We're using ZVAL's now. Index: php4/main.c diff -u php4/main.c:1.163 php4/main.c:1.164 --- php4/main.c:1.163 Sun Dec 19 16:02:39 1999 +++ php4/main.c Tue Dec 21 12:14:28 1999 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.163 1999/12/19 21:02:39 zeev Exp $ */ +/* $Id: main.c,v 1.164 1999/12/21 17:14:28 andrei Exp $ */ #include <stdio.h> @@ -1173,7 +1173,7 @@ arr = (pval *) emalloc(sizeof(pval)); arr->value.ht = (HashTable *) emalloc(sizeof(HashTable)); - if (zend_hash_init(arr->value.ht, 0, NULL, PVAL_PTR_DTOR, 0) == FAILURE) { + if (zend_hash_init(arr->value.ht, 0, NULL, ZVAL_PTR_DTOR, 0) == FAILURE) { php_error(E_WARNING, "Unable to create argv array"); } else { arr->type = IS_ARRAY; Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.17 php4/ext/com/COM.c:1.18 --- php4/ext/com/COM.c:1.17 Fri Dec 17 14:51:03 1999 +++ php4/ext/com/COM.c Tue Dec 21 12:14:29 1999 @@ -414,7 +414,7 @@ pval_arg->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); pval_arg->is_ref=1; pval_arg->refcount=1; - zend_hash_init(pval_arg->value.obj.properties, 0, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(pval_arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); handle = (pval *) emalloc(sizeof(pval)); handle->type = IS_LONG; Index: php4/ext/java/java.c diff -u php4/ext/java/java.c:1.6 php4/ext/java/java.c:1.7 --- php4/ext/java/java.c:1.6 Sat Dec 18 07:03:51 1999 +++ php4/ext/java/java.c Tue Dec 21 12:14:30 1999 @@ -497,7 +497,7 @@ presult->value.obj.properties = (HashTable *) emalloc(sizeof(HashTable)); presult->is_ref=1; presult->refcount=1; - zend_hash_init(presult->value.obj.properties, 0, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(presult->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0); }; handle = (pval *) emalloc(sizeof(pval)); Index: php4/ext/standard/array.c diff -u php4/ext/standard/array.c:1.16 php4/ext/standard/array.c:1.17 --- php4/ext/standard/array.c:1.16 Sun Dec 19 13:58:27 1999 +++ php4/ext/standard/array.c Tue Dec 21 12:14:31 1999 @@ -1205,7 +1205,7 @@ /* Create and initialize output hash */ out_hash = (HashTable *)emalloc(sizeof(HashTable)); - zend_hash_init(out_hash, 0, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(out_hash, 0, NULL, ZVAL_PTR_DTOR, 0); /* Start at the beginning of the input hash and copy entries to output hash until offset is reached */ Index: php4/ext/standard/browscap.c diff -u php4/ext/standard/browscap.c:1.17 php4/ext/standard/browscap.c:1.18 --- php4/ext/standard/browscap.c:1.17 Sun Dec 19 21:09:58 1999 +++ php4/ext/standard/browscap.c Tue Dec 21 12:14:31 1999 @@ -104,13 +104,13 @@ *return_value = **agent; return_value->type = IS_OBJECT; pval_copy_constructor(return_value); - return_value->value.ht->pDestructor = PVAL_DESTRUCTOR; + return_value->value.ht->pDestructor = ZVAL_DESTRUCTOR; while (zend_hash_find((*agent)->value.ht, "parent",sizeof("parent"), (void **) &agent_name)==SUCCESS) { if (zend_hash_find(&browser_hash,(*agent_name)->value.str.val, (*agent_name)->value.str.len+1, (void **)&agent)==FAILURE) { break; } - zend_hash_merge(return_value->value.ht,(*agent)->value.ht, PVAL_COPY_CTOR, (void *) &tmp, sizeof(pval), 0); + zend_hash_merge(return_value->value.ht,(*agent)->value.ht, ZVAL_COPY_CTOR, (void *) &tmp, sizeof(pval), 0); } } Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.39 php4/ext/standard/var.c:1.40 --- php4/ext/standard/var.c:1.39 Sat Dec 18 17:35:28 1999 +++ php4/ext/standard/var.c Tue Dec 21 12:14:31 1999 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.39 1999/12/18 22:35:28 zeev Exp $ */ +/* $Id: var.c,v 1.40 1999/12/21 17:14:31 andrei Exp $ */ /* {{{ includes @@ -421,7 +421,7 @@ i = atoi(*p); if (cur == 'a') { /* object_init_ex will init the HashTable for objects! */ - zend_hash_init(myht, i + 1, NULL, PVAL_PTR_DTOR, 0); + zend_hash_init(myht, i + 1, NULL, ZVAL_PTR_DTOR, 0); } while (**p && **p != ':') {