fix data types

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 69327778e3dc6a2f1004bbe5a5d1c6ef9032fb82..bd0f330a2f2bd61f8692245c6e9c79d94fc4c6ba 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -891,7 +891,7 @@ ZEND_API int zend_parse_method_parameters_ex(int flags, int num_args, zval *this
 /* }}} */
 
 /* Argument parsing API -- andrei */
-ZEND_API int _array_init(zval *arg, uint size ZEND_FILE_LINE_DC) /* {{{ */
+ZEND_API int _array_init(zval *arg, uint32_t size ZEND_FILE_LINE_DC) /* {{{ */
 {
        ZVAL_NEW_ARR(arg);
        _zend_hash_init(Z_ARRVAL_P(arg), size, ZVAL_PTR_DTOR, 0 ZEND_FILE_LINE_RELAY_CC);

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index d84fbcb2bfef5b5b893b461f2517c2229dd04b7f..75d7ecd5fbdc9accf625bd21fac0b6dc842d56b7 100644 (file)
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -367,7 +367,7 @@ ZEND_API char *zend_get_type_by_const(int type);
 #define object_init(arg)               _object_init((arg) ZEND_FILE_LINE_CC)
 #define object_init_ex(arg, ce)        _object_init_ex((arg), (ce) ZEND_FILE_LINE_CC)
 #define object_and_properties_init(arg, ce, properties)        _object_and_properties_init((arg), (ce), (properties) ZEND_FILE_LINE_CC)
-ZEND_API int _array_init(zval *arg, uint size ZEND_FILE_LINE_DC);
+ZEND_API int _array_init(zval *arg, uint32_t size ZEND_FILE_LINE_DC);
 ZEND_API int _object_init(zval *arg ZEND_FILE_LINE_DC);
 ZEND_API int _object_init_ex(zval *arg, zend_class_entry *ce ZEND_FILE_LINE_DC);
 ZEND_API int _object_and_properties_init(zval *arg, zend_class_entry *ce, HashTable *properties ZEND_FILE_LINE_DC);

diff --git a/ext/standard/array.c b/ext/standard/array.c
index f923ad9e7b565b3bdca3ef4417e5397236cec673..f0f7d7848ba8845b6faace1544ef1f0f0c47ccd5 100644 (file)
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1726,7 +1726,7 @@ PHP_FUNCTION(range)
                                goto err;
                        }
                        /* Initialize the return_value as an array. */
-                       array_init_size(return_value, ((low - high) / lstep) + 1);
+                       array_init_size(return_value, (uint32_t)(((low - high) / lstep) + 1));
                        zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
                        ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                                for (; low >= high; low -= (unsigned int)lstep) {
@@ -1746,7 +1746,7 @@ PHP_FUNCTION(range)
                                err = 1;
                                goto err;
                        }
-                       array_init_size(return_value, ((high - low) / lstep) + 1);
+                       array_init_size(return_value, (uint32_t)(((high - low) / lstep) + 1));
                        zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
                        ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                                for (; low <= high; low += (unsigned int)lstep) {
@@ -1785,7 +1785,7 @@ double_str:
                                goto err;
                        }
 
-                       array_init_size(return_value, ((low - high) / step) + 1);
+                       array_init_size(return_value, (uint32_t)(((low - high) / step) + 1));
                        zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
                        ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                        for (value = low; value >= (high - DOUBLE_DRIFT_FIX); value = low - (++i * step)) {
@@ -1799,7 +1799,7 @@ double_str:
                                goto err;
                        }
 
-                       array_init_size(return_value, ((high - low) / step) + 1);
+                       array_init_size(return_value, (uint32_t)(((high - low) / step) + 1));
                        zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
                        ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                                for (value = low; value <= (high + DOUBLE_DRIFT_FIX); value = low + (++i * step)) {
@@ -1826,7 +1826,7 @@ long_str:
                                err = 1;
                                goto err;
                        }
-                       array_init_size(return_value, ((low - high) / lstep) + 1);
+                       array_init_size(return_value, (uint32_t)(((low - high) / lstep) + 1));
                        zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
                        ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                                for (; low >= high; low -= lstep) {
@@ -1839,7 +1839,7 @@ long_str:
                                err = 1;
                                goto err;
                        }
-                       array_init_size(return_value, ((high - low) / lstep) + 1);
+                       array_init_size(return_value, (uint32_t)(((high - low) / lstep) + 1));
                        zend_hash_real_init(Z_ARRVAL_P(return_value), 1);
                        ZEND_HASH_FILL_PACKED(Z_ARRVAL_P(return_value)) {
                                for (; low <= high; low += lstep) {