@@ -112,15 +112,8 @@ static int xmlreader_property_reader(xmlreader_object *obj, xmlreader_prop_handl
112
112
/* {{{ xmlreader_get_property_ptr_ptr */
113
113
zval * xmlreader_get_property_ptr_ptr (zend_object * object , zend_string * name , int type , void * * cache_slot )
114
114
{
115
- xmlreader_object * obj ;
116
115
zval * retval = NULL ;
117
- xmlreader_prop_handler * hnd = NULL ;
118
-
119
- obj = php_xmlreader_fetch_object (object );
120
-
121
- if (obj -> prop_handler != NULL ) {
122
- hnd = zend_hash_find_ptr (obj -> prop_handler , name );
123
- }
116
+ xmlreader_prop_handler * hnd = zend_hash_find_ptr (& xmlreader_prop_handlers , name );
124
117
125
118
if (hnd == NULL ) {
126
119
retval = zend_std_get_property_ptr_ptr (object , name , type , cache_slot );
@@ -133,15 +126,9 @@ zval *xmlreader_get_property_ptr_ptr(zend_object *object, zend_string *name, int
133
126
/* {{{ xmlreader_read_property */
134
127
zval * xmlreader_read_property (zend_object * object , zend_string * name , int type , void * * cache_slot , zval * rv )
135
128
{
136
- xmlreader_object * obj ;
137
129
zval * retval = NULL ;
138
- xmlreader_prop_handler * hnd = NULL ;
139
-
140
- obj = php_xmlreader_fetch_object (object );
141
-
142
- if (obj -> prop_handler != NULL ) {
143
- hnd = zend_hash_find_ptr (obj -> prop_handler , name );
144
- }
130
+ xmlreader_object * obj = php_xmlreader_fetch_object (object );
131
+ xmlreader_prop_handler * hnd = zend_hash_find_ptr (& xmlreader_prop_handlers , name );
145
132
146
133
if (hnd != NULL ) {
147
134
if (xmlreader_property_reader (obj , hnd , rv ) == FAILURE ) {
@@ -160,14 +147,8 @@ zval *xmlreader_read_property(zend_object *object, zend_string *name, int type,
160
147
/* {{{ xmlreader_write_property */
161
148
zval * xmlreader_write_property (zend_object * object , zend_string * name , zval * value , void * * cache_slot )
162
149
{
163
- xmlreader_object * obj ;
164
- xmlreader_prop_handler * hnd = NULL ;
150
+ xmlreader_prop_handler * hnd = zend_hash_find_ptr (& xmlreader_prop_handlers , name );
165
151
166
- obj = php_xmlreader_fetch_object (object );
167
-
168
- if (obj -> prop_handler != NULL ) {
169
- hnd = zend_hash_find_ptr (obj -> prop_handler , name );
170
- }
171
152
if (hnd != NULL ) {
172
153
zend_throw_error (NULL , "Cannot modify readonly property %s::$%s" , ZSTR_VAL (object -> ce -> name ), ZSTR_VAL (name ));
173
154
} else {
@@ -354,7 +335,6 @@ zend_object *xmlreader_objects_new(zend_class_entry *class_type)
354
335
intern = zend_object_alloc (sizeof (xmlreader_object ), class_type );
355
336
zend_object_std_init (& intern -> std , class_type );
356
337
object_properties_init (& intern -> std , class_type );
357
- intern -> prop_handler = & xmlreader_prop_handlers ;
358
338
359
339
return & intern -> std ;
360
340
}
0 commit comments