cvs: php4 /ext/standard incomplete_class.c php_incomplete_class.h var.c

sas Fri Jun 23 09:58:30 2000 EDT Modified files: /php4/ext/standard incomplete_class.c php_incomplete_class.h var.c Log: API change: Use zval * instead of zval ** Index: php4/ext/standard/incomplete_class.c diff -u php4/ext/standard/incomplete_class.c:1.1 php4/ext/standard/incomplete_class.c:1.2 --- php4/ext/standard/incomplete_class.c:1.1 Fri Jun 23 09:46:04 2000 +++ php4/ext/standard/incomplete_class.c Fri Jun 23 09:58:30 2000 @@ -17,7 +17,7 @@ */ -/* $Id: incomplete_class.c,v 1.1 2000/06/23 16:46:04 sas Exp $ */ +/* $Id: incomplete_class.c,v 1.2 2000/06/23 16:58:30 sas Exp $ */ #include "php.h" #include "basic_functions.h" @@ -38,7 +38,7 @@ char buf[1024]; char *class_name; - class_name = php_lookup_class_name(&ref->object, NULL, 0); + class_name = php_lookup_class_name(ref->object, NULL, 0); if (!class_name) class_name = estrdup("unknown"); @@ -88,25 +88,25 @@ } -char *php_lookup_class_name(zval **object, size_t *nlen, zend_bool del) +char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del) { zval **val; char *retval = NULL; - if (zend_hash_find((*object)->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS) { + if (zend_hash_find(object->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS) { retval = estrndup(Z_STRVAL_PP(val), Z_STRLEN_PP(val)); if (nlen) *nlen = Z_STRLEN_PP(val); if (del) - zend_hash_del((*object)->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER)); + zend_hash_del(object->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER)); } return (retval); } -void php_store_class_name(zval **object, const char *name, size_t len) +void php_store_class_name(zval *object, const char *name, size_t len) { zval *val; @@ -116,5 +116,5 @@ Z_STRVAL_P(val) = estrndup(name, len); Z_STRLEN_P(val) = len; - zend_hash_update((*object)->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), &val, sizeof(val), NULL); + zend_hash_update(object->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), &val, sizeof(val), NULL); } Index: php4/ext/standard/php_incomplete_class.h diff -u php4/ext/standard/php_incomplete_class.h:1.1 php4/ext/standard/php_incomplete_class.h:1.2 --- php4/ext/standard/php_incomplete_class.h:1.1 Fri Jun 23 09:46:04 2000 +++ php4/ext/standard/php_incomplete_class.h Fri Jun 23 09:58:30 2000 @@ -20,6 +20,8 @@ #ifndef PHP_INCOMPLETE_CLASS_H #define PHP_INCOMPLETE_CLASS_H +#include "ext/standard/basic_functions.h" + #define PHP_IC_ENTRY \ BG(incomplete_class) @@ -27,13 +29,13 @@ (PHP_IC_ENTRY ? PHP_IC_ENTRY : php_create_incomplete_class(BLS_C)) -#define PHP_SET_CLASS_ATTRIBUTES() \ - if ((*struc)->value.obj.ce == BG(incomplete_class)) { \ +#define PHP_SET_CLASS_ATTRIBUTES(struc) \ + if ((struc)->value.obj.ce == BG(incomplete_class)) { \ class_name = php_lookup_class_name(struc, &name_len, 1); \ free_class_name = 1; \ } else { \ - class_name = (*struc)->value.obj.ce->name; \ - name_len = (*struc)->value.obj.ce->name_length; \ + class_name = (struc)->value.obj.ce->name; \ + name_len = (struc)->value.obj.ce->name_length; \ } #define PHP_CLEANUP_CLASS_ATTRIBUTES() \ @@ -52,8 +54,8 @@ zend_class_entry *php_create_incomplete_class(BLS_D); -char *php_lookup_class_name(zval **object, size_t *nlen, zend_bool del); -void php_store_class_name(zval **object, const char *name, size_t len); +char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del); +void php_store_class_name(zval *object, const char *name, size_t len); #ifdef __cplusplus }; Index: php4/ext/standard/var.c diff -u php4/ext/standard/var.c:1.69 php4/ext/standard/var.c:1.70 --- php4/ext/standard/var.c:1.69 Fri Jun 23 09:46:04 2000 +++ php4/ext/standard/var.c Fri Jun 23 09:58:30 2000 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var.c,v 1.69 2000/06/23 16:46:04 sas Exp $ */ +/* $Id: var.c,v 1.70 2000/06/23 16:58:30 sas Exp $ */ /* {{{ includes @@ -217,7 +217,7 @@ if (retval_ptr && HASH_OF(retval_ptr)) { int count = zend_hash_num_elements(HASH_OF(retval_ptr)); - PHP_SET_CLASS_ATTRIBUTES(); + PHP_SET_CLASS_ATTRIBUTES(*struc); slen = sprintf(s, "O:%d:\"%s\":%d:{",name_len,class_name, count); PHP_CLEANUP_CLASS_ATTRIBUTES(); @@ -278,7 +278,7 @@ } else { PHP_CLASS_ATTRIBUTES; - PHP_SET_CLASS_ATTRIBUTES(); + PHP_SET_CLASS_ATTRIBUTES(*struc); slen = sprintf(s, "O:%d:\"%s\":%d:{",name_len,class_name,i); PHP_CLEANUP_CLASS_ATTRIBUTES(); } @@ -477,7 +477,7 @@ myht = (*rval)->value.obj.properties; if (incomplete_class) - php_store_class_name(rval, class_name, name_len); + php_store_class_name(*rval, class_name, name_len); if (class_name) efree(class_name);