- Whitespace and change the name of the macro to something more verbose

  ZEND_GET_RESOURCE_ID(...)

diff --git a/Zend/zend_list.c b/Zend/zend_list.c
index 2119c25a86501218ba17d77b7cb75f6df4d7c1d1..0576556c5f183a8f323fa1e5894d8ab5eb83e749 100644 (file)
--- a/Zend/zend_list.c
+++ b/Zend/zend_list.c
@@ -324,8 +324,7 @@ ZEND_API int zend_fetch_list_dtor_id(char *type_name)
 
        zend_hash_internal_pointer_reset_ex(&list_destructors, &pos);
        while(zend_hash_get_current_data_ex(&list_destructors, (void **)&lde, &pos) == SUCCESS) {
-               if(strcmp(type_name, lde->type_name) == 0)
-               {
+               if(strcmp(type_name, lde->type_name) == 0) {
 #if 0
                        printf("Found resource id %d for resource type %s\n",(*lde).resource_id,type_name);
 #endif

diff --git a/Zend/zend_list.h b/Zend/zend_list.h
index 7509dbf70414af43872b58b870c9c2e7a40d308f..942236ceddc84cc27fbf6c4c0ee08b042e23a92c 100644 (file)
--- a/Zend/zend_list.h
+++ b/Zend/zend_list.h
@@ -102,8 +102,8 @@ extern ZEND_API int le_index_ptr;  /* list entry type for index pointers */
 #define ZEND_REGISTER_RESOURCE(rsrc_result, rsrc_pointer, rsrc_type)  \
     zend_register_resource(rsrc_result, rsrc_pointer, rsrc_type);
 
-#define ZEND_GET_LE(le_id, le_type_name)               \
-    if(le_id == 0) {                                   \
+#define ZEND_GET_RESOURCE_ID(le_id, le_type_name)      \
+    if (le_id == 0) {                                  \
         le_id = zend_fetch_list_dtor_id(le_type_name); \
        }