com php-src: fix datatype mismatches: ext/spl/spl_fixedarray .c
| From: | Anatol Belski | Date: | Wed, 29 Oct 2014 14:30:08 +0000 |
| Subject: | com php-src: fix datatype mismatches: ext/spl/spl_fixedarray .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82848@lists.php.net to get a copy of this message | ||
Commit: e888f3e4de511faf65924eba7ac92bb9d02f32b5
Author: Anatol Belski <ab@php.net> Tue, 28 Oct 2014 20:12:20 +0100
Parents: 8041bbb76bb07274cb96bc6b8b8e0cee42648edc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e888f3e4de511faf65924eba7ac92bb9d02f32b5
Log:
fix datatype mismatches
Changed paths:
M ext/spl/spl_fixedarray.c
Diff:
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
index ee5ef6b..d63ac2e 100644
--- a/ext/spl/spl_fixedarray.c
+++ b/ext/spl/spl_fixedarray.c
@@ -151,7 +151,7 @@ static HashTable* spl_fixedarray_object_get_gc(zval *obj, zval **table, int *n T
if (intern->array) {
*table = intern->array->elements;
- *n = intern->array->size;
+ *n = (int)intern->array->size;
} else {
*table = NULL;
*n = 0;
@@ -165,10 +165,10 @@ static HashTable* spl_fixedarray_object_get_properties(zval *obj TSRMLS_DC) /*
{
{
spl_fixedarray_object *intern = Z_SPLFIXEDARRAY_P(obj);
HashTable *ht = zend_std_get_properties(obj TSRMLS_CC);
- int i = 0;
+ zend_long i = 0;
if (intern->array) {
- int j = zend_hash_num_elements(ht);
+ zend_long j = zend_hash_num_elements(ht);
for (i = 0; i < intern->array->size; i++) {
if (!Z_ISUNDEF(intern->array->elements[i])) {