review object management

Author: remicollet

src/php/handlers/php_deque_handlers.c

@@ -9,7 +9,7 @@ zend_object_handlers php_deque_handlers;
 static zval *php_ds_deque_read_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, int type, zval *return_value) {
-    ds_deque_t *deque = ((php_ds_deque_t*)obj)->deque;
+    ds_deque_t *deque = php_ds_deque_fetch_object(obj)->deque;
 #else
 (zval *obj, zval *offset, int type, zval *return_value) {
     ds_deque_t *deque = Z_DS_DEQUE_P(obj);
@@ -47,7 +47,7 @@ static zval *php_ds_deque_read_dimension
 static void php_ds_deque_write_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, zval *value) {
-    ds_deque_t *deque = ((php_ds_deque_t*)obj)->deque;
+    ds_deque_t *deque = php_ds_deque_fetch_object(obj)->deque;
 #else
 (zval *obj, zval *offset, zval *value) {
     ds_deque_t *deque = Z_DS_DEQUE_P(obj);
@@ -69,7 +69,7 @@ static void php_ds_deque_write_dimension
 static int php_ds_deque_has_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, int check_empty) {
-    ds_deque_t *deque = ((php_ds_deque_t*)obj)->deque;
+    ds_deque_t *deque = php_ds_deque_fetch_object(obj)->deque;
 #else
 (zval *obj, zval *offset, int check_empty) {
     ds_deque_t *deque = Z_DS_DEQUE_P(obj);
@@ -86,7 +86,7 @@ static int php_ds_deque_has_dimension
 static void php_ds_deque_unset_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset) {
-    ds_deque_t *deque = ((php_ds_deque_t*)obj)->deque;
+    ds_deque_t *deque = php_ds_deque_fetch_object(obj)->deque;
 #else
 (zval *obj, zval *offset) {
     ds_deque_t *deque = Z_DS_DEQUE_P(obj);
@@ -111,24 +111,25 @@ static void php_ds_deque_unset_dimension
 static int php_ds_deque_count_elements
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zend_long *count) {
-    *count = ((php_ds_deque_t*)obj)->deque->size; return SUCCESS;
+    *count = php_ds_deque_fetch_object(obj)->deque->size;
 #else
 (zval *obj, zend_long *count) {
-    *count = Z_DS_DEQUE_P(obj)->size; return SUCCESS;
+    *count = Z_DS_DEQUE_P(obj)->size;
 #endif
+    return SUCCESS;
 }
 
 static void php_ds_deque_free_object(zend_object *object)
 {
-    php_ds_deque_t *obj = (php_ds_deque_t*) object;
-    zend_object_std_dtor(&obj->std);
+    php_ds_deque_t *obj = php_ds_deque_fetch_object(object);
     ds_deque_free(obj->deque);
+    zend_object_std_dtor(&obj->std);
 }
 
 static HashTable *php_ds_deque_get_debug_info
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, int *is_temp) {
-    ds_deque_t *deque = ((php_ds_deque_t*)obj)->deque;
+    ds_deque_t *deque = php_ds_deque_fetch_object(obj)->deque;
 #else
 (zval *obj, int *is_temp) {
     ds_deque_t *deque = Z_DS_DEQUE_P(obj);
@@ -142,7 +143,7 @@ static HashTable *php_ds_deque_get_debug_info
 static zend_object *php_ds_deque_clone_obj
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj) {
-    return php_ds_deque_create_clone(((php_ds_deque_t*)obj)->deque);
+    return php_ds_deque_create_clone(php_ds_deque_fetch_object(obj)->deque);
 #else 
 (zval *obj) {
     return php_ds_deque_create_clone(Z_DS_DEQUE_P(obj));
@@ -152,7 +153,7 @@ static zend_object *php_ds_deque_clone_obj
 static HashTable *php_ds_deque_get_gc
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval **gc_data, int *gc_count) {
-    ds_deque_t *deque = ((php_ds_deque_t*)obj)->deque;
+    ds_deque_t *deque = php_ds_deque_fetch_object(obj)->deque;
 #else
 (zval *obj, zval **gc_data, int *gc_count) {
     ds_deque_t *deque = Z_DS_DEQUE_P(obj);

src/php/handlers/php_map_handlers.c

@@ -8,7 +8,7 @@ zend_object_handlers php_map_handlers;
 static zval *php_ds_map_read_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, int type, zval *rv) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj, zval *offset, int type, zval *rv) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -46,7 +46,7 @@ static zval *php_ds_map_read_dimension
 static void php_ds_map_write_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, zval *value) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj, zval *offset, zval *value) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -62,7 +62,7 @@ static void php_ds_map_write_dimension
 static int php_ds_map_has_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, int check_empty) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj, zval *offset, int check_empty) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -74,7 +74,7 @@ static int php_ds_map_has_dimension
 static void php_ds_map_unset_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj, zval *offset) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -86,7 +86,7 @@ static void php_ds_map_unset_dimension
 static int php_ds_map_count_elements
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zend_long *count) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj, zend_long *count) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -97,15 +97,15 @@ static int php_ds_map_count_elements
 
 static void php_ds_map_free_object(zend_object *object)
 {
-    php_ds_map_t *intern = (php_ds_map_t*) object;
-    zend_object_std_dtor(&intern->std);
+    php_ds_map_t *intern = php_ds_map_fetch_object(object);
     ds_map_free(intern->map);
+    zend_object_std_dtor(&intern->std);
 }
 
 static HashTable *php_ds_map_get_debug_info
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, int *is_temp) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj, int *is_temp) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -117,7 +117,7 @@ static HashTable *php_ds_map_get_debug_info
 static zend_object *php_ds_map_clone_obj
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -128,7 +128,7 @@ static zend_object *php_ds_map_clone_obj
 static HashTable *php_ds_map_get_gc
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval **gc_data, int *gc_size) {
-    ds_map_t *map = ((php_ds_map_t*)obj)->map;
+    ds_map_t *map = php_ds_map_fetch_object(obj)->map;
 #else
 (zval *obj, zval **gc_data, int *gc_size) {
     ds_map_t *map = Z_DS_MAP_P(obj);
@@ -147,7 +147,7 @@ void php_ds_register_map_handlers()
 {
     memcpy(&php_map_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_map_handlers.offset             = 0;
+    php_map_handlers.offset             = XtOffsetOf(php_ds_map_t, std);
     php_map_handlers.dtor_obj           = zend_objects_destroy_object;
     php_map_handlers.get_gc             = php_ds_map_get_gc;
     php_map_handlers.free_obj           = php_ds_map_free_object;

src/php/handlers/php_priority_queue_handlers.c

@@ -8,19 +8,19 @@ zend_object_handlers php_priority_queue_handlers;
 
 static void php_ds_priority_queue_free_object(zend_object *object)
 {
-    php_ds_priority_queue_t *queue = (php_ds_priority_queue_t*) object;
-    zend_object_std_dtor(&queue->std);
+    php_ds_priority_queue_t *queue = php_ds_priority_queue_fetch_object(object);
     ds_priority_queue_free(queue->queue);
 
     if (queue->gc_data != NULL) {
         efree(queue->gc_data);
     }
+    zend_object_std_dtor(&queue->std);
 }
 
 static int php_ds_priority_queue_count_elements
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zend_long *count) {
-    ds_priority_queue_t *pq = ((php_ds_priority_queue_t *) obj)->queue;
+    ds_priority_queue_t *pq = php_ds_priority_queue_fetch_object(obj)->queue;
 #else
 (zval *obj, zend_long *count) {
     ds_priority_queue_t *pq = Z_DS_PRIORITY_QUEUE_P(obj);
@@ -32,7 +32,7 @@ static int php_ds_priority_queue_count_elements
 static zend_object *php_ds_priority_queue_clone_obj
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj) {
-    ds_priority_queue_t *pq = ((php_ds_priority_queue_t *) obj)->queue;
+    ds_priority_queue_t *pq = php_ds_priority_queue_fetch_object(obj)->queue;
 #else
 (zval *obj) {
     ds_priority_queue_t *pq = Z_DS_PRIORITY_QUEUE_P(obj);
@@ -43,7 +43,7 @@ static zend_object *php_ds_priority_queue_clone_obj
 static HashTable *php_ds_priority_queue_get_debug_info
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, int *is_temp) {
-    ds_priority_queue_t *pq = ((php_ds_priority_queue_t *) obj)->queue;
+    ds_priority_queue_t *pq = php_ds_priority_queue_fetch_object(obj)->queue;
 #else
 (zval *obj, int *is_temp) {
     ds_priority_queue_t *pq = Z_DS_PRIORITY_QUEUE_P(obj);
@@ -57,7 +57,7 @@ static HashTable *php_ds_priority_queue_get_debug_info
 static HashTable *php_ds_priority_queue_get_gc
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval **gc_data, int *gc_size) {
-    ds_priority_queue_t *pq = ((php_ds_priority_queue_t *) obj)->queue;
+    ds_priority_queue_t *pq = php_ds_priority_queue_fetch_object(obj)->queue;
 #else
 (zval *obj, zval **gc_data, int *gc_size) {
     ds_priority_queue_t *pq = Z_DS_PRIORITY_QUEUE_P(obj);

src/php/handlers/php_queue_handlers.c

@@ -10,7 +10,7 @@ zend_object_handlers php_queue_handlers;
 static void php_ds_queue_write_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, zval *value) {
-    ds_queue_t *queue = ((php_ds_queue_t*)obj)->queue;
+    ds_queue_t *queue = php_ds_queue_fetch_object(obj)->queue;
 #else
 (zval *obj, zval *offset, zval *value) {
     ds_queue_t *queue = Z_DS_QUEUE_P(obj);
@@ -24,15 +24,15 @@ static void php_ds_queue_write_dimension
 
 static void php_ds_queue_free_object(zend_object *object)
 {
-    php_ds_queue_t *queue = (php_ds_queue_t*) object;
-    zend_object_std_dtor(&queue->std);
+    php_ds_queue_t *queue = php_ds_queue_fetch_object(object);
     ds_queue_free(queue->queue);
+    zend_object_std_dtor(&queue->std);
 }
 
 static int php_ds_queue_count_elements
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zend_long *count) {
-    ds_queue_t *queue = ((php_ds_queue_t*)obj)->queue;
+    ds_queue_t *queue = php_ds_queue_fetch_object(obj)->queue;
 #else
 (zval *obj, zend_long *count) {
     ds_queue_t *queue = Z_DS_QUEUE_P(obj);
@@ -44,7 +44,7 @@ static int php_ds_queue_count_elements
 static zend_object *php_ds_queue_clone_obj
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj) {
-    ds_queue_t *queue = ((php_ds_queue_t*)obj)->queue;
+    ds_queue_t *queue = php_ds_queue_fetch_object(obj)->queue;
 #else
 (zval *obj) {
     ds_queue_t *queue = Z_DS_QUEUE_P(obj);
@@ -55,7 +55,7 @@ static zend_object *php_ds_queue_clone_obj
 static HashTable *php_ds_queue_get_debug_info
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, int *is_temp) {
-    ds_queue_t *queue = ((php_ds_queue_t*)obj)->queue;
+    ds_queue_t *queue = php_ds_queue_fetch_object(obj)->queue;
 #else
 (zval *obj, int *is_temp) {
     ds_queue_t *queue = Z_DS_QUEUE_P(obj);
@@ -69,7 +69,7 @@ static HashTable *php_ds_queue_get_debug_info
 static HashTable *php_ds_queue_get_gc
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval **gc_data, int *gc_count) {
-    ds_queue_t *queue = ((php_ds_queue_t*)obj)->queue;
+    ds_queue_t *queue = php_ds_queue_fetch_object(obj)->queue;
 #else
 (zval *obj, zval **gc_data, int *gc_count) {
     ds_queue_t *queue = Z_DS_QUEUE_P(obj);

src/php/handlers/php_set_handlers.c

@@ -9,7 +9,7 @@ zend_object_handlers php_ds_set_handlers;
 static zval *php_ds_set_read_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, int type, zval *rv) {
-    ds_set_t *set = ((php_ds_set_t*)obj)->set;
+    ds_set_t *set = php_ds_set_fetch_object(obj)->set;
 #else
 (zval *obj, zval *offset, int type, zval *rv) {
     ds_set_t *set = Z_DS_SET_P(obj);
@@ -30,7 +30,7 @@ static zval *php_ds_set_read_dimension
 static void php_ds_set_write_dimension
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval *offset, zval *value) {
-    ds_set_t *set = ((php_ds_set_t*)obj)->set;
+    ds_set_t *set = php_ds_set_fetch_object(obj)->set;
 #else
 (zval *obj, zval *offset, zval *value) {
     ds_set_t *set = Z_DS_SET_P(obj);
@@ -45,7 +45,7 @@ static void php_ds_set_write_dimension
 static int php_ds_set_count_elements
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zend_long *count) {
-    ds_set_t *set = ((php_ds_set_t*)obj)->set;
+    ds_set_t *set = php_ds_set_fetch_object(obj)->set;
 #else
 (zval *obj, zend_long *count) {
     ds_set_t *set = Z_DS_SET_P(obj);
@@ -56,15 +56,15 @@ static int php_ds_set_count_elements
 
 static void php_ds_set_free_object(zend_object *object)
 {
-    php_ds_set_t *obj = (php_ds_set_t*) object;
-    zend_object_std_dtor(&obj->std);
+    php_ds_set_t *obj = php_ds_set_fetch_object(object);
     ds_set_free(obj->set);
+    zend_object_std_dtor(&obj->std);
 }
 
 static HashTable *php_ds_set_get_debug_info
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, int *is_temp) {
-    ds_set_t *set = ((php_ds_set_t*)obj)->set;
+    ds_set_t *set = php_ds_set_fetch_object(obj)->set;
 #else
 (zval *obj, int *is_temp) {
     ds_set_t *set = Z_DS_SET_P(obj);
@@ -79,7 +79,7 @@ static HashTable *php_ds_set_get_debug_info
 static zend_object *php_ds_set_clone_obj
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj) {
-    ds_set_t *set = ((php_ds_set_t*)obj)->set;
+    ds_set_t *set = php_ds_set_fetch_object(obj)->set;
 #else
 (zval *obj) {
     ds_set_t *set = Z_DS_SET_P(obj);
@@ -90,7 +90,7 @@ static zend_object *php_ds_set_clone_obj
 static HashTable *php_ds_set_get_gc
 #if PHP_VERSION_ID >= 80000
 (zend_object *obj, zval **gc_data, int *gc_count) {
-    ds_set_t *set = ((php_ds_set_t*)obj)->set;
+    ds_set_t *set = php_ds_set_fetch_object(obj)->set;
 #else
 (zval *obj, zval **gc_data, int *gc_count) {
     ds_set_t *set = Z_DS_SET_P(obj);
@@ -110,7 +110,7 @@ void php_ds_register_set_handlers()
 {
     memcpy(&php_ds_set_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 
-    php_ds_set_handlers.offset = 0; // XtOffsetOf(php_ds_set_t, std);
+    php_ds_set_handlers.offset = XtOffsetOf(php_ds_set_t, std);
 
     php_ds_set_handlers.cast_object     = php_ds_default_cast_object;
     php_ds_set_handlers.clone_obj       = php_ds_set_clone_obj;