andi Tue Feb 27 12:16:36 2001 EDT
Modified files:
/php4/ext/oci8 oci8.c
/php4/ext/readline readline.c
/php4/ext/sablot sablot.c
/php4/ext/session mod_user.c
/php4/ext/standard assert.c
/php4/ext/xml xml.c
Log:
- Pointed out by Andrei. zval_ptr_dtor() should be used instead of the
zval_del_ref() function which should be nuked.
Index: php4/ext/oci8/oci8.c
diff -u php4/ext/oci8/oci8.c:1.111 php4/ext/oci8/oci8.c:1.112
--- php4/ext/oci8/oci8.c:1.111 Sun Feb 25 22:07:08 2001
+++ php4/ext/oci8/oci8.c Tue Feb 27 12:16:34 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.111 2001/02/26 06:07:08 andi Exp $ */
+/* $Id: oci8.c,v 1.112 2001/02/27 20:16:34 andi Exp $ */
/* TODO list:
*
@@ -489,7 +489,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.111 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.112 $");
#ifndef PHP_WIN32
php_info_print_table_row(2, "Oracle Version", PHP_OCI8_VERSION );
php_info_print_table_row(2, "Compile-time ORACLE_HOME", PHP_OCI8_DIR );
@@ -509,7 +509,7 @@
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_debug("_oci_bind_hash_dtor:");
- zval_del_ref(&(bind->zval));
+ zval_ptr_dtor(&(bind->zval));
}
/* }}} */
Index: php4/ext/readline/readline.c
diff -u php4/ext/readline/readline.c:1.18 php4/ext/readline/readline.c:1.19
--- php4/ext/readline/readline.c:1.18 Sun Feb 25 22:07:14 2001
+++ php4/ext/readline/readline.c Tue Feb 27 12:16:35 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: readline.c,v 1.18 2001/02/26 06:07:14 andi Exp $ */
+/* $Id: readline.c,v 1.19 2001/02/27 20:16:35 andi Exp $ */
/* {{{ includes & prototypes */
@@ -397,7 +397,7 @@
}
for (i = 0; i < 4; i++) {
- zval_del_ref(¶ms[i]);
+ zval_ptr_dtor(¶ms[i]);
}
zval_dtor(&_readline_array);
Index: php4/ext/sablot/sablot.c
diff -u php4/ext/sablot/sablot.c:1.35 php4/ext/sablot/sablot.c:1.36
--- php4/ext/sablot/sablot.c:1.35 Sun Feb 25 22:07:15 2001
+++ php4/ext/sablot/sablot.c Tue Feb 27 12:16:35 2001
@@ -71,7 +71,7 @@
/* 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 @@
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 @@
efree(retval);
for (i=0; i<argc; i++) {
- zval_del_ref(&(args[i]));
+ zval_ptr_dtor(&(args[i]));
}
}
/* }}} */
@@ -1460,7 +1460,7 @@
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 @@
*byteCount = Z_STRLEN_P(argv[3]);
for (idx = 1; idx < 3; idx++) {
- zval_del_ref(&(argv[idx]));
+ zval_ptr_dtor(&(argv[idx]));
}
}
Index: php4/ext/session/mod_user.c
diff -u php4/ext/session/mod_user.c:1.13 php4/ext/session/mod_user.c:1.14
--- php4/ext/session/mod_user.c:1.13 Sun Feb 25 22:07:15 2001
+++ php4/ext/session/mod_user.c Tue Feb 27 12:16:35 2001
@@ -107,7 +107,7 @@
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);
Index: php4/ext/standard/assert.c
diff -u php4/ext/standard/assert.c:1.27 php4/ext/standard/assert.c:1.28
--- php4/ext/standard/assert.c:1.27 Sun Feb 25 22:07:16 2001
+++ php4/ext/standard/assert.c Tue Feb 27 12:16:35 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: assert.c,v 1.27 2001/02/26 06:07:16 andi Exp $ */
+/* $Id: assert.c,v 1.28 2001/02/27 20:16:35 andi Exp $ */
/* {{{ includes/startup/misc */
@@ -227,9 +227,9 @@
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)) {
Index: php4/ext/xml/xml.c
diff -u php4/ext/xml/xml.c:1.73 php4/ext/xml/xml.c:1.74
--- php4/ext/xml/xml.c:1.73 Sun Feb 25 22:07:25 2001
+++ php4/ext/xml/xml.c Tue Feb 27 12:16:35 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml.c,v 1.73 2001/02/26 06:07:25 andi Exp $ */
+/* $Id: xml.c,v 1.74 2001/02/27 20:16:35 andi Exp $ */
#define IS_EXT_MODULE
#include "php.h"
@@ -296,7 +296,7 @@
/* please leave this commented - or ask [EMAIL PROTECTED] before doing it
(again)
if (parser->object) {
- zval_del_ref(&parser->object);
+ zval_ptr_dtor(&parser->object);
}
*/
@@ -310,38 +310,38 @@
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 @@
}
for (i = 0; i < argc; i++) {
- zval_del_ref(&(argv[i]));
+ zval_ptr_dtor(&(argv[i]));
}
if (result == FAILURE) {
@@ -1181,7 +1181,7 @@
/* please leave this commented - or ask [EMAIL PROTECTED] before doing it
(again)
if (parser->object) {
- zval_del_ref(&parser->object);
+ zval_ptr_dtor(&parser->object);
}
*/
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
