com php-src: fix datatype mismatch warnings: Zend/zend_hash .h

From: Date: Thu, 19 Mar 2015 21:33:12 +0000
Subject: com php-src: fix datatype mismatch warnings: Zend/zend_hash .h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85656@lists.php.net to get a copy of this message
Commit: 743541b31101898ee0b3ddfe0a9ca192c2312457 Author: Anatol Belski <ab@php.net> Thu, 19 Mar 2015 07:45:10 +0100 Parents: 452a5d8e6bf7839477514e041d2a480ca4402191 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=743541b31101898ee0b3ddfe0a9ca192c2312457 Log: fix datatype mismatch warnings Changed paths: M Zend/zend_hash.h Diff: diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index 9b7050c..689b8ca 100644 --- a/Zend/zend_hash..h +++ b/Zend/zend_hash.h @@ -811,7 +811,7 @@ static zend_always_inline void _zend_hash_append(HashTable *ht, zend_string *key ZVAL_COPY_VALUE(&p->val, zv); p->key = zend_string_copy(key); p->h = zend_string_hash_val(key); - nIndex = p->h | ht->nTableMask; + nIndex = (uint32_t)p->h | ht->nTableMask; Z_NEXT(p->val) = HT_HASH(ht, nIndex); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(idx); ht->nNumUsed = idx + 1; @@ -827,7 +827,7 @@ static zend_always_inline void _zend_hash_append_ptr(HashTable *ht, zend_string ZVAL_PTR(&p->val, ptr); p->key = zend_string_copy(key); p->h = zend_string_hash_val(key); - nIndex = p->h | ht->nTableMask; + nIndex = (uint32_t)p->h | ht->nTableMask; Z_NEXT(p->val) = HT_HASH(ht, nIndex); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(idx); ht->nNumUsed = idx + 1; @@ -843,7 +843,7 @@ static zend_always_inline void _zend_hash_append_ind(HashTable *ht, zend_string ZVAL_INDIRECT(&p->val, ptr); p->key = zend_string_copy(key); p->h = zend_string_hash_val(key); - nIndex = p->h | ht->nTableMask; + nIndex = (uint32_t)p->h | ht->nTableMask; Z_NEXT(p->val) = HT_HASH(ht, nIndex); HT_HASH(ht, nIndex) = HT_IDX_TO_HASH(idx); ht->nNumUsed = idx + 1;

« previous php.cvs (#85656) next »