cvs: ZendEngine2 / zend_ts_hash.c zend_ts_hash.h

tony2001		Fri Jan  9 19:16:03 2009 UTC

  Modified files:              
    /ZendEngine2	zend_ts_hash.c zend_ts_hash.h 
  Log:
  add zend_ts_hash_copy_to_hash()
  
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ts_hash.c?r1=1.22&r2=1.23&diff_format=u
Index: ZendEngine2/zend_ts_hash.c
diff -u ZendEngine2/zend_ts_hash.c:1.22 ZendEngine2/zend_ts_hash.c:1.23
--- ZendEngine2/zend_ts_hash.c:1.22	Wed Dec 31 11:12:29 2008
+++ ZendEngine2/zend_ts_hash.c	Fri Jan  9 19:16:02 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ts_hash.c,v 1.22 2008/12/31 11:12:29 sebastian Exp $ */
+/* $Id: zend_ts_hash.c,v 1.23 2009/01/09 19:16:02 tony2001 Exp $ */
 
 #include "zend.h"
 #include "zend_ts_hash.h"
@@ -298,6 +298,14 @@
 }
 /* }}} */
 
+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);
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ts_hash.h?r1=1.19&r2=1.20&diff_format=u
Index: ZendEngine2/zend_ts_hash.h
diff -u ZendEngine2/zend_ts_hash.h:1.19 ZendEngine2/zend_ts_hash.h:1.20
--- ZendEngine2/zend_ts_hash.h:1.19	Wed Dec 31 11:12:29 2008
+++ ZendEngine2/zend_ts_hash.h	Fri Jan  9 19:16:02 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_ts_hash.h,v 1.19 2008/12/31 11:12:29 sebastian Exp $ */
+/* $Id: zend_ts_hash.h,v 1.20 2009/01/09 19:16:02 tony2001 Exp $ */
 
 #ifndef ZEND_TS_HASH_H
 #define ZEND_TS_HASH_H
@@ -97,6 +97,7 @@
 
 /* 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);