cvs: php4 /ext/session mod_user.c session.c

sas Sun Jan 7 02:32:07 2001 EDT Modified files: /php4/ext/session mod_user.c session.c Log: Use zval_ptr_dtor instead of zval_dtor/FREE_ZVAL pair. Submitted by: Andi Gutmans Index: php4/ext/session/mod_user.c diff -u php4/ext/session/mod_user.c:1.11 php4/ext/session/mod_user.c:1.12 --- php4/ext/session/mod_user.c:1.11 Sun Dec 24 08:30:42 2000 +++ php4/ext/session/mod_user.c Sun Jan 7 02:32:06 2001 @@ -58,14 +58,12 @@ MAKE_STD_ZVAL(retval); if (call_user_function(EG(function_table), NULL, func, retval, argc, argv) == FAILURE) { - zval_dtor(retval); - FREE_ZVAL(retval); + zval_ptr_dtor(&retval); retval = NULL; } for (i = 0; i < argc; i++) { - zval_dtor(argv[i]); - FREE_ZVAL(argv[i]); + zval_ptr_dtor(&argv[i]); } return retval; @@ -84,8 +82,7 @@ if (retval) { \ convert_to_long(retval); \ ret = retval->value.lval; \ - zval_dtor(retval); \ - FREE_ZVAL(retval); \ + zval_ptr_dtor(&retval); \ } \ return ret @@ -133,8 +130,7 @@ *vallen = retval->value.str.len; ret = SUCCESS; } - zval_dtor(retval); - FREE_ZVAL(retval); + zval_ptr_dtor(&retval); } return ret; Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.190 php4/ext/session/session.c:1.191 --- php4/ext/session/session.c:1.190 Sun Dec 24 08:30:42 2000 +++ php4/ext/session/session.c Sun Jan 7 02:32:06 2001 @@ -477,8 +477,7 @@ } } - zval_dtor(retval); - FREE_ZVAL(retval); + zval_ptr_dtor(&retval); return ret; }