cvs: ZendEngine2 / zend_compile.h zend_opcode.c

sesser Sun Jun 6 04:37:12 2004 EDT Modified files: /ZendEngine2 zend_compile.h zend_opcode.c Log: Fixed Zend Function Destructor to use correct TSRM handle. http://cvs.php.net/diff.php/ZendEngine2/zend_compile.h?r1=1.283&r2=1.284&ty=u Index: ZendEngine2/zend_compile.h diff -u ZendEngine2/zend_compile.h:1.283 ZendEngine2/zend_compile.h:1.284 --- ZendEngine2/zend_compile.h:1.283 Tue Mar 16 14:46:04 2004 +++ ZendEngine2/zend_compile.h Sun Jun 6 04:37:12 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_compile.h,v 1.283 2004/03/16 19:46:04 zeev Exp $ */ +/* $Id: zend_compile.h,v 1.284 2004/06/06 08:37:12 sesser Exp $ */ #ifndef ZEND_COMPILE_H #define ZEND_COMPILE_H @@ -494,13 +494,14 @@ ZEND_API int zend_cleanup_function_data(zend_function *function TSRMLS_DC); ZEND_API void destroy_zend_function(zend_function *function TSRMLS_DC); +ZEND_API void zend_function_dtor(zend_function *function); ZEND_API void destroy_zend_class(zend_class_entry **pce); void zend_class_add_ref(zend_class_entry **ce); ZEND_API void zend_mangle_property_name(char **dest, int *dest_length, char *src1, int src1_length, char *src2, int src2_length, int internal); ZEND_API void zend_unmangle_property_name(char *mangled_property, char **prop_name, char **class_name); -#define ZEND_FUNCTION_DTOR (void (*)(void *)) destroy_zend_function +#define ZEND_FUNCTION_DTOR (void (*)(void *)) zend_function_dtor #define ZEND_CLASS_DTOR (void (*)(void *)) destroy_zend_class zend_op *get_next_op(zend_op_array *op_array TSRMLS_DC); http://cvs.php.net/diff.php/ZendEngine2/zend_opcode.c?r1=1.102&r2=1.103&ty=u Index: ZendEngine2/zend_opcode.c diff -u ZendEngine2/zend_opcode.c:1.102 ZendEngine2/zend_opcode.c:1.103 --- ZendEngine2/zend_opcode.c:1.102 Wed Feb 25 04:25:37 2004 +++ ZendEngine2/zend_opcode.c Sun Jun 6 04:37:12 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_opcode.c,v 1.102 2004/02/25 09:25:37 zeev Exp $ */ +/* $Id: zend_opcode.c,v 1.103 2004/06/06 08:37:12 sesser Exp $ */ #include <stdio.h> @@ -106,6 +106,13 @@ /* do nothing */ break; } +} + +ZEND_API void zend_function_dtor(zend_function *function) +{ + TSRMLS_FETCH(); + + destroy_zend_function(function TSRMLS_CC); } static void zend_cleanup_op_array_data(zend_op_array *op_array)