com php-src: fix size types in zend_ts_hash.*: Zend/z end_ts_hash.c Zend/zend_ts_hash.h

Commit: 3ea59f0d518b0b6a86864c1bfdfb0f757bf8def6 Author: Anatol Belski <ab@php.net> Sat, 8 Feb 2014 20:04:31 +0100 Parents: da452e33e7055eac60e93bee37dfa566f59e1471 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3ea59f0d518b0b6a86864c1bfdfb0f757bf8def6 Log: fix size types in zend_ts_hash.* Changed paths: M Zend/zend_ts_hash.c M Zend/zend_ts_hash.h Diff: diff --git a/Zend/zend_ts_hash.c b/Zend/zend_ts_hash.c index 96fdc14..6874b10 100644 --- a/Zend/zend_ts_hash.c +++ b/Zend/zend_ts_hash.c @@ -99,7 +99,7 @@ ZEND_API void zend_ts_hash_clean(TsHashTable *ht) end_write(ht); } -ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) +ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) { int retval; @@ -110,7 +110,7 @@ ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKey return retval; } -ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) +ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) { int retval; @@ -121,7 +121,7 @@ ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uin return retval; } -ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) +ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC) { int retval; @@ -132,7 +132,7 @@ ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uin return retval; } -ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, uint nKeyLength) +ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, zend_size_t nKeyLength) { int retval; @@ -187,7 +187,7 @@ ZEND_API void zend_ts_hash_reverse_apply(TsHashTable *ht, apply_func_t apply_fun end_write(ht); } -ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, int flag) +ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, int flag) { int retval; @@ -198,7 +198,7 @@ ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nK return retval; } -ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength) +ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, zend_size_t nKeyLength) { zend_uint_t retval; @@ -209,7 +209,7 @@ ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint n return retval; } -ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, void **pData) +ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void **pData) { int retval; @@ -220,7 +220,7 @@ ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, vo return retval; } -ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void **pData) +ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void **pData) { int retval; @@ -242,7 +242,7 @@ ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, zend_uint_t h, void **pDat return retval; } -ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, uint nKeyLength) +ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, zend_size_t nKeyLength) { int retval; diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h index 1f83c50..a2a6f99 100644 --- a/Zend/zend_ts_hash.h +++ b/Zend/zend_ts_hash.h @@ -49,25 +49,25 @@ ZEND_API void zend_ts_hash_clean(TsHashTable *ht); /* additions/updates/changes */ -ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); +ZEND_API int _zend_ts_hash_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); #define zend_ts_hash_update(ht, arKey, nKeyLength, pData, nDataSize, pDest) \ _zend_ts_hash_add_or_update(ht, arKey, nKeyLength, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_ts_hash_add(ht, arKey, nKeyLength, pData, nDataSize, pDest) \ _zend_ts_hash_add_or_update(ht, arKey, nKeyLength, pData, nDataSize, pDest, HASH_ADD ZEND_FILE_LINE_CC) -ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); +ZEND_API int _zend_ts_hash_quick_add_or_update(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); #define zend_ts_hash_quick_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \ _zend_ts_hash_quick_add_or_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_ts_hash_quick_add(ht, arKey, nKeyLength, h, pData, nDataSize, pDest) \ _zend_ts_hash_quick_add_or_update(ht, arKey, nKeyLength, h, pData, nDataSize, pDest, HASH_ADD ZEND_FILE_LINE_CC) -ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, uint nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); +ZEND_API int _zend_ts_hash_index_update_or_next_insert(TsHashTable *ht, zend_uint_t h, void *pData, zend_size_t nDataSize, void **pDest, int flag ZEND_FILE_LINE_DC); #define zend_ts_hash_index_update(ht, h, pData, nDataSize, pDest) \ _zend_ts_hash_index_update_or_next_insert(ht, h, pData, nDataSize, pDest, HASH_UPDATE ZEND_FILE_LINE_CC) #define zend_ts_hash_next_index_insert(ht, pData, nDataSize, pDest) \ _zend_ts_hash_index_update_or_next_insert(ht, 0, pData, nDataSize, pDest, HASH_NEXT_INSERT ZEND_FILE_LINE_CC) -ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, uint nKeyLength); +ZEND_API int zend_ts_hash_add_empty_element(TsHashTable *ht, char *arKey, zend_size_t nKeyLength); ZEND_API void zend_ts_hash_graceful_destroy(TsHashTable *ht); ZEND_API void zend_ts_hash_apply(TsHashTable *ht, apply_func_t apply_func TSRMLS_DC); @@ -78,21 +78,21 @@ ZEND_API void zend_ts_hash_reverse_apply(TsHashTable *ht, apply_func_t apply_fun /* Deletes */ -ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, int flag); +ZEND_API int zend_ts_hash_del_key_or_index(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, int flag); #define zend_ts_hash_del(ht, arKey, nKeyLength) \ zend_ts_hash_del_key_or_index(ht, arKey, nKeyLength, 0, HASH_DEL_KEY) #define zend_ts_hash_index_del(ht, h) \ zend_ts_hash_del_key_or_index(ht, NULL, 0, h, HASH_DEL_INDEX) -ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, uint nKeyLength); +ZEND_API zend_uint_t zend_ts_get_hash_value(TsHashTable *ht, char *arKey, zend_size_t nKeyLength); /* Data retreival */ -ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, uint nKeyLength, void **pData); -ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, uint nKeyLength, zend_uint_t h, void **pData); +ZEND_API int zend_ts_hash_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, void **pData); +ZEND_API int zend_ts_hash_quick_find(TsHashTable *ht, char *arKey, zend_size_t nKeyLength, zend_uint_t h, void **pData); ZEND_API int zend_ts_hash_index_find(TsHashTable *ht, zend_uint_t h, void **pData); /* Misc */ -ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, uint nKeyLength); +ZEND_API int zend_ts_hash_exists(TsHashTable *ht, char *arKey, zend_size_t nKeyLength); ZEND_API int zend_ts_hash_index_exists(TsHashTable *ht, zend_uint_t h); /* Copying, merging and sorting */