- Pointed out by Andrei. zval_ptr_dtor() should be used instead of the

  zval_del_ref() function which should be nuked.

diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
index c19d4db669e65c02426cfb507152cd91c9c85c07..cff8178e3a6aed232e09080f84ddd8d71991fc95 100644 (file)
--- a/ext/oci8/oci8.c
+++ b/ext/oci8/oci8.c
@@ -509,7 +509,7 @@ _oci_define_hash_dtor(void *data)
 
        oci_debug("_oci_define_hash_dtor: %s",define->name);
 
-       zval_del_ref(&define->zval);
+       zval_ptr_dtor(&define->zval);
 
        if (define->name) {
                efree(define->name);
@@ -527,7 +527,7 @@ _oci_bind_hash_dtor(void *data)
 
        oci_debug("_oci_bind_hash_dtor:");
 
-       zval_del_ref(&(bind->zval));
+       zval_ptr_dtor(&(bind->zval));
 }
 
 /* }}} */

diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index 679f0b20500d44fb1b115533e4115c5f332f76e4..f9a83a0fb28517c559fa4322e06cbf958f701af7 100644 (file)
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -397,7 +397,7 @@ static char **_readline_completion_cb(char *text, int start, int end)
        }
        
        for (i = 0; i < 4; i++) {
-               zval_del_ref(&params[i]);
+               zval_ptr_dtor(&params[i]);
        }
        zval_dtor(&_readline_array);
        

diff --git a/ext/sablot/sablot.c b/ext/sablot/sablot.c
index 90a7adf184f6fc03ca9b9a1ed37a95a533c7338d..edddb53289b66477e74278886107e87b986a201d 100644 (file)
--- a/ext/sablot/sablot.c
+++ b/ext/sablot/sablot.c
@@ -71,7 +71,7 @@ static zval *_php_sablot_resource_zval(long);
 
 /* Free macros */
 #define S_FREE(__var) if (__var) efree(__var);
-#define FUNCH_FREE(__var) if (__var) zval_del_ref(&(__var));        
+#define FUNCH_FREE(__var) if (__var) zval_ptr_dtor(&(__var));        
 
 /* ERROR Macros */
 
@@ -1136,7 +1136,7 @@ static void _php_sablot_handler_pair(php_sablot *handle, zval **first_func, zval
             default:
                 convert_to_string_ex(handler);
                 php_error(E_WARNING, "Sorry, too many elements, %s discarded", Z_STRVAL_PP(handler));
-                zval_del_ref(handler);
+                zval_ptr_dtor(handler);
                 break;
         }
         item++;
@@ -1161,7 +1161,7 @@ static void _php_sablot_call_handler_function(zval *handlerName, int argc, zval
     efree(retval);
     
     for (i=0; i<argc; i++) {
-        zval_del_ref(&(args[i]));
+        zval_ptr_dtor(&(args[i]));
     }
 }
 /* }}} */
@@ -1460,7 +1460,7 @@ static MH_ERROR _php_sablot_error(void *userData, SablotHandle p, MH_ERROR code,
         efree(retval);
 
                for (i = 1; i < argc; i++) {
-                       zval_del_ref(&argv[i]);
+                       zval_ptr_dtor(&argv[i]);
                }
     } else {
        if (level == MH_LEVEL_CRITICAL ||
@@ -1541,7 +1541,7 @@ static int _php_sablot_sh_getAll(void *userData, SablotHandle p, const char *sch
                *byteCount = Z_STRLEN_P(argv[3]);
 
                for (idx = 1; idx < 3; idx++) {
-                       zval_del_ref(&(argv[idx]));
+                       zval_ptr_dtor(&(argv[idx]));
                }
        }
 

diff --git a/ext/session/mod_user.c b/ext/session/mod_user.c
index c36a7b57f5a31838a5ff43981aa4e65003d84ad0..7064908f9332729915dc7d7909e9c37617b26db4 100644 (file)
--- a/ext/session/mod_user.c
+++ b/ext/session/mod_user.c
@@ -107,7 +107,7 @@ PS_CLOSE_FUNC(user)
        retval = ps_call_handler(PSF(close), 0, NULL);
 
        for (i = 0; i < 6; i++)
-               zval_del_ref(&mdata->names[i]);
+               zval_ptr_dtor(&mdata->names[i]);
        efree(mdata);
 
        PS_SET_MOD_DATA(NULL);

diff --git a/ext/standard/assert.c b/ext/standard/assert.c
index 5bc569865d012526c20461cd063cda78b2c2838b..91eb3fde4ea352f1cfea95754d37cd45fc6edf0b 100644 (file)
--- a/ext/standard/assert.c
+++ b/ext/standard/assert.c
@@ -227,9 +227,9 @@ PHP_FUNCTION(assert)
                call_user_function(CG(function_table), NULL, args[0], retval, 3, args+1);
 
                for (i = 0; i < 4; i++) {
-                       zval_del_ref(&(args[i]));
+                       zval_ptr_dtor(&(args[i]));
                }
-               zval_del_ref(&retval);
+               zval_ptr_dtor(&retval);
        }
 
        if (ASSERT(warning)) {

diff --git a/ext/xml/xml.c b/ext/xml/xml.c
index 2ad9cfbcc345e5dc29f351572a39e8177820223c..ec65dece2e43a7f4875923980b345d062f901323 100644 (file)
--- a/ext/xml/xml.c
+++ b/ext/xml/xml.c
@@ -296,7 +296,7 @@ xml_parser_dtor(zend_rsrc_list_entry *rsrc)
 
        /* please leave this commented - or ask thies@thieso.net before doing it (again) 
     if (parser->object) {
-               zval_del_ref(&parser->object);
+               zval_ptr_dtor(&parser->object);
        }
        */
        
@@ -310,38 +310,38 @@ xml_parser_dtor(zend_rsrc_list_entry *rsrc)
                efree(parser->ltags);
        }
        if (parser->startElementHandler) {
-               zval_del_ref(&parser->startElementHandler);
+               zval_ptr_dtor(&parser->startElementHandler);
        }
        if (parser->endElementHandler) {
-               zval_del_ref(&parser->endElementHandler);
+               zval_ptr_dtor(&parser->endElementHandler);
        }
        if (parser->characterDataHandler) {
-               zval_del_ref(&parser->characterDataHandler);
+               zval_ptr_dtor(&parser->characterDataHandler);
        }
        if (parser->processingInstructionHandler) {
-               zval_del_ref(&parser->processingInstructionHandler);
+               zval_ptr_dtor(&parser->processingInstructionHandler);
        }
        if (parser->defaultHandler) {
-               zval_del_ref(&parser->defaultHandler);
+               zval_ptr_dtor(&parser->defaultHandler);
        }
        if (parser->unparsedEntityDeclHandler) {
-               zval_del_ref(&parser->unparsedEntityDeclHandler);
+               zval_ptr_dtor(&parser->unparsedEntityDeclHandler);
        }
        if (parser->notationDeclHandler) {
-               zval_del_ref(&parser->notationDeclHandler);
+               zval_ptr_dtor(&parser->notationDeclHandler);
        }
        if (parser->externalEntityRefHandler) {
-               zval_del_ref(&parser->externalEntityRefHandler);
+               zval_ptr_dtor(&parser->externalEntityRefHandler);
        }
        if (parser->unknownEncodingHandler) {
-               zval_del_ref(&parser->unknownEncodingHandler);
+               zval_ptr_dtor(&parser->unknownEncodingHandler);
        }
 #ifdef HAVE_LIBEXPAT2
        if (parser->startNamespaceDeclHandler) {
-               zval_del_ref(&parser->startNamespaceDeclHandler);
+               zval_ptr_dtor(&parser->startNamespaceDeclHandler);
        }
        if (parser->endNamespaceDeclHandler) {
-               zval_del_ref(&parser->endNamespaceDeclHandler);
+               zval_ptr_dtor(&parser->endNamespaceDeclHandler);
        }
 #endif
        if (parser->baseURI) {
@@ -404,7 +404,7 @@ xml_call_handler(xml_parser *parser, zval *handler, int argc, zval **argv)
                }
 
                for (i = 0; i < argc; i++) {
-                       zval_del_ref(&(argv[i]));
+                       zval_ptr_dtor(&(argv[i]));
                }
 
                if (result == FAILURE) {
@@ -1181,7 +1181,7 @@ PHP_FUNCTION(xml_set_object)
 
        /* please leave this commented - or ask thies@thieso.net before doing it (again) 
     if (parser->object) {
-               zval_del_ref(&parser->object);
+               zval_ptr_dtor(&parser->object);
        }
        */