Mega-patch to get better resource information for modules.

  * Fixed a bug in zend_rsrc_list_get_rsrc_type()
  * Switched register_list_destructors() to use
    zend_register_list_destructors_ex() instead
  * Updated all relevant modules to provide the resource type name
    to register_list_destructors() call
  * Updated var_dump() to output resource type name instead of number

@- Made resource type names visible, e.g. var_dump() and
@  get_resource_type() display "file" for file resources. (Andrei)

1 files changed, 7 insertions, 8 deletions

diff --git a/ext/shmop/shmop.c b/ext/shmop/shmop.c
index f2531acd18..bbaadb84c0 100644
--- a/ext/shmop/shmop.c
+++ b/ext/shmop/shmop.c
@@ -60,21 +60,20 @@ zend_module_entry shmop_module_entry = {
 ZEND_GET_MODULE(shmop)
 #endif
 
-static void rsclean(struct php_shmop *shmop);
+static void rsclean(zend_rsrc_list_entry *rsrc)
+{
+	struct php_shmop *shmop = (struct php_shmop *)rsrc->ptr;
+	shmdt(shmop->addr);
+	efree(shmop);
+}
 
 PHP_MINIT_FUNCTION(shmop)
 {
-	shm_type = register_list_destructors(rsclean, NULL);
+	shm_type = register_list_destructors(rsclean, NULL, "shmop");
 	
 	return SUCCESS;
 }
 
-static void rsclean(struct php_shmop *shmop)
-{
-	shmdt(shmop->addr);
-	efree(shmop);
-}
-
 PHP_MSHUTDOWN_FUNCTION(shmop)
 {
 	return SUCCESS;