- Use object macros

diff --git a/ext/standard/incomplete_class.c b/ext/standard/incomplete_class.c
index 3f8094596b1d24af8653cbb02f2e4060e75a54f7..4fd4d786f764de42a8c3f49b130b0a5eaffabb80 100644 (file)
--- a/ext/standard/incomplete_class.c
+++ b/ext/standard/incomplete_class.c
@@ -109,15 +109,18 @@ char *php_lookup_class_name(zval *object, size_t *nlen, zend_bool del)
 {
        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 @@ void php_store_class_name(zval *object, const char *name, size_t len)
        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);
 }
 /* }}} */
 

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index addebc2f61899ba9fa62fbdf85936bf2e444c1f1..f43d3be8c6ede60a11a599c9c91135d69132758f 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -389,7 +389,7 @@ xml_call_handler(xml_parser *parser, zval *handler, int argc, zval **argv)
                                           zend_hash_index_find(handler->value.ht, 1, (void **) &method) == SUCCESS &&
                                           Z_TYPE_PP(obj) == IS_OBJECT &&
                                           Z_TYPE_PP(method) == IS_STRING) {
-                               php_error(E_WARNING, "Unable to call handler %s::%s()", (*obj)->value.obj.ce->name, Z_STRVAL_PP(method));
+                               php_error(E_WARNING, "Unable to call handler %s::%s()", Z_OBJCE_PP(obj)->name, Z_STRVAL_PP(method));
                        } else
                                php_error(E_WARNING, "Unable to call handler");