ZE2 Patch View as Markdown

Good catch - go ahead and commit.

Zeev

At 03:04 06/06/2004, Stefan Esser wrote:

Hi,

I could commit it myself but maybe you want to apply some cosmetic
fixes first.

Stefan Esser

diff -Nur php-5.0.0RC3RC2.orig/Zend/zend_compile.h
php-5.0.0RC3RC2/Zend/zend_compile.h
--- php-5.0.0RC3RC2.orig/Zend/zend_compile.h Tue Mar 16 20:46:04 2004
+++ php-5.0.0RC3RC2/Zend/zend_compile.h Sun Jun 6 04:22:25 2004
@@ -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);
diff -Nur php-5.0.0RC3RC2.orig/Zend/zend_opcode.c
php-5.0.0RC3RC2/Zend/zend_opcode.c
--- php-5.0.0RC3RC2.orig/Zend/zend_opcode.c Wed Feb 25 10:25:37 2004
+++ php-5.0.0RC3RC2/Zend/zend_opcode.c Sun Jun 6 04:21:06 2004
@@ -108,6 +108,13 @@
}
}

+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)
{
if (op_array->static_variables) {