com php-src: convert API for size_t where zend_string is used under the hood: Zend/zend_ts_hash. c Zend/zend_ts_hash.h
| From: | Anatol Belski | Date: | Tue, 28 Oct 2014 16:24:59 +0000 |
| Subject: | com php-src: convert API for size_t where zend_string is used under the hood: Zend/zend_ts_hash. c Zend/zend_ts_hash.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82748@lists.php.net to get a copy of this message | ||
Commit: e4464a8e85cde188e4361c14580adee85b1e7df3
Author: Anatol Belski <ab@php.net> Tue, 28 Oct 2014 10:43:10 +0100
Parents: 36b64b44d57f3043ebdaf5bd0c3aa4168f96bd69
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e4464a8e85cde188e4361c14580adee85b1e7df3
Log:
convert API for size_t where zend_string is used under the hood
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 43f02b4..dd7aaeb 100644
--- a/Zend/zend_ts_hash.c
+++ b/Zend/zend_ts_hash.c
@@ -333,7 +333,7 @@ ZEND_API int zend_ts_hash_rehash(TsHashTable *ht)
return retval;
}
-ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, int len)
+ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, size_t len)
{
zval *retval;
@@ -344,7 +344,7 @@ ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, int len)
return retval;
}
-ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, int len, zval *pData
ZEND_FILE_LINE_DC)
+ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, size_t len, zval *pData
ZEND_FILE_LINE_DC)
{
zval *retval;
@@ -355,7 +355,7 @@ ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, int le
return retval;
}
-ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, int len, zval *pData
ZEND_FILE_LINE_DC)
+ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, size_t len, zval *pData
ZEND_FILE_LINE_DC)
{
zval *retval;
diff --git a/Zend/zend_ts_hash.h b/Zend/zend_ts_hash.h
index 6cb3641..4bac7db 100644
--- a/Zend/zend_ts_hash.h
+++ b/Zend/zend_ts_hash.h
@@ -102,16 +102,16 @@ void zend_ts_hash_display_pListTail(TsHashTable *ht);
void zend_ts_hash_display(TsHashTable *ht);
#endif
-ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, int len);
-ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, int len, zval *pData
ZEND_FILE_LINE_DC);
-ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, int len, zval *pData
ZEND_FILE_LINE_DC);
+ZEND_API zval *zend_ts_hash_str_find(TsHashTable *ht, const char *key, size_t len);
+ZEND_API zval *_zend_ts_hash_str_update(TsHashTable *ht, const char *key, size_t len, zval *pData
ZEND_FILE_LINE_DC);
+ZEND_API zval *_zend_ts_hash_str_add(TsHashTable *ht, const char *key, size_t len, zval *pData
ZEND_FILE_LINE_DC);
#define zend_ts_hash_str_update(ht, key, len, pData) \
_zend_ts_hash_str_update(ht, key, len, pData ZEND_FILE_LINE_CC)
#define zend_ts_hash_str_add(ht, key, len, pData) \
_zend_ts_hash_str_add(ht, key, len, pData ZEND_FILE_LINE_CC)
-static zend_always_inline void *zend_ts_hash_str_find_ptr(TsHashTable *ht, const char *str, int
len)
+static zend_always_inline void *zend_ts_hash_str_find_ptr(TsHashTable *ht, const char *str, size_t
len)
{
zval *zv;
@@ -119,7 +119,7 @@ static zend_always_inline void *zend_ts_hash_str_find_ptr(TsHashTable *ht, const
return zv ? Z_PTR_P(zv) : NULL;
}
-static zend_always_inline void *zend_ts_hash_str_update_ptr(TsHashTable *ht, const char *str, int
len, void *pData)
+static zend_always_inline void *zend_ts_hash_str_update_ptr(TsHashTable *ht, const char *str,
size_t len, void *pData)
{
zval tmp, *zv;
@@ -128,7 +128,7 @@ static zend_always_inline void *zend_ts_hash_str_update_ptr(TsHashTable *ht, con
return zv ? Z_PTR_P(zv) : NULL;
}
-static zend_always_inline void *zend_ts_hash_str_add_ptr(TsHashTable *ht, const char *str, int len,
void *pData)
+static zend_always_inline void *zend_ts_hash_str_add_ptr(TsHashTable *ht, const char *str, size_t
len, void *pData)
{
zval tmp, *zv;