From f4e5ed247c80dd5b9a0a7ce25aabf22a5423980b Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 9 Jan 2009 19:16:02 +0000 Subject: [PATCH] add zend_ts_hash_copy_to_hash() --- Zend/zend_ts_hash.c | 8 ++++++++ Zend/zend_ts_hash.h | 1 + 2 files changed, 9 insertions(+) diff --git a/Zend/zend_ts_hash.c b/Zend/zend_ts_hash.c index ca6b2d2dae..31570e231e 100644 --- a/Zend/zend_ts_hash.c +++ b/Zend/zend_ts_hash.c @@ -298,6 +298,14 @@ ZEND_API void zend_ts_hash_copy(TsHashTable *target, TsHashTable *source, copy_c } /* }}} */ +ZEND_API void zend_ts_hash_copy_to_hash(HashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size) /* {{{ */ +{ + begin_read(source); + zend_hash_copy(target, TS_HASH(source), pCopyConstructor, tmp, size); + end_read(source); +} +/* }}} */ + ZEND_API void zend_ts_hash_merge(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, int overwrite) /* {{{ */ { begin_read(source); diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h index 617d14f9db..099ee0d015 100644 --- a/Zend/zend_ts_hash.h +++ b/Zend/zend_ts_hash.h @@ -97,6 +97,7 @@ ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, ulong h); /* Copying, merging and sorting */ ZEND_API void zend_ts_hash_copy(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size); +ZEND_API void zend_ts_hash_copy_to_hash(HashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size); ZEND_API void zend_ts_hash_merge(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, void *tmp, uint size, int overwrite); ZEND_API void zend_ts_hash_merge_ex(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, uint size, merge_checker_func_t pMergeSource, void *pParam); ZEND_API int zend_ts_hash_sort(TsHashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber TSRMLS_DC); -- 2.50.1