From 0e08845eb09950d367258961e22faf1cf33f74a3 Mon Sep 17 00:00:00 2001 From: Zeev Suraski Date: Mon, 15 Jan 2001 10:52:06 +0000 Subject: [PATCH] Add free_estring() --- Zend/zend.c | 5 +++++ Zend/zend.h | 2 ++ Zend/zend_compile.c | 7 +------ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 8fbb1f5f1d..3ba4b1ee9b 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -782,3 +782,8 @@ ZEND_API char *zend_make_compiled_string_description(char *name) return compiled_string_description; } + +void free_estring(char **str_p) +{ + efree(*str_p); +} diff --git a/Zend/zend.h b/Zend/zend.h index f9017bf561..d1a5cd6fbb 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -309,6 +309,8 @@ ZEND_API void zend_output_debug_string(zend_bool trigger_break, char *format, .. ZEND_API extern char *empty_string; +ZEND_API void free_estring(char **str_p); + #define STR_FREE(ptr) if (ptr && ptr!=empty_string) { efree(ptr); } #define STR_FREE_REL(ptr) if (ptr && ptr!=empty_string) { efree_rel(ptr); } diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index b1ee2bdc7a..0d79011271 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -34,11 +34,6 @@ ZEND_API zend_compiler_globals compiler_globals; ZEND_API zend_executor_globals executor_globals; #endif -static void free_filename(void *p) -{ - efree(*((char **) p)); -} - static void build_runtime_defined_function_key(zval *result, zval *name, zend_op *opline CLS_DC) { @@ -80,7 +75,7 @@ void init_compiler(CLS_D ELS_DC) CG(active_class_entry) = NULL; zend_llist_init(&CG(list_llist), sizeof(list_llist_element), NULL, 0); zend_llist_init(&CG(dimension_llist), sizeof(int), NULL, 0); - zend_hash_init(&CG(filenames_table), 5, NULL, (dtor_func_t) free_filename, 0); + zend_hash_init(&CG(filenames_table), 5, NULL, (dtor_func_t) free_estring, 0); CG(handle_op_arrays) = 1; CG(in_compilation) = 0; zend_init_rsrc_list(ELS_C); -- 2.50.1