cvs: php4 /ext/standard incomplete_class.c

andi Sat Jul 28 14:40:18 2001 EDT Modified files: /php4/ext/standard incomplete_class.c Log: - Use object macros Index: php4/ext/standard/incomplete_class.c diff -u php4/ext/standard/incomplete_class.c:1.8 php4/ext/standard/incomplete_class.c:1.9 --- php4/ext/standard/incomplete_class.c:1.8 Sat Jul 28 07:36:17 2001 +++ php4/ext/standard/incomplete_class.c Sat Jul 28 14:40:18 2001 @@ -17,7 +17,7 @@ */ -/* $Id: incomplete_class.c,v 1.8 2001/07/28 11:36:17 zeev Exp $ */ +/* $Id: incomplete_class.c,v 1.9 2001/07/28 18:40:18 andi Exp $ */ #include "php.h" #include "basic_functions.h" @@ -109,15 +109,18 @@ { zval **val; char *retval = NULL; + HashTable *object_properties; - if (zend_hash_find(object->value.obj.properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER), (void **) &val) == SUCCESS) { + object_properties = Z_OBJPROP_P(object); + + if (zend_hash_find(object_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_properties, MAGIC_MEMBER, sizeof(MAGIC_MEMBER)); } return (retval); @@ -136,7 +139,7 @@ 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(Z_OBJPROP_P(object), MAGIC_MEMBER, sizeof(MAGIC_MEMBER), &val, sizeof(val), NULL); } /* }}} */