From: Anatol Belski <ab@php.net>
Date: Thu, 12 Feb 2015 08:27:58 +0000 (+0100)
Subject: fix data types
X-Git-Tag: PRE_PHP7_EREG_MYSQL_REMOVALS~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07fdc1c78bff2ce89869b49315294001d3c430c0;p=php

fix data types
---

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 69327778e3..bd0f330a2f 100644
--- 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 d84fbcb2bf..75d7ecd5fb 100644
--- 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 f923ad9e7b..f0f7d7848b 100644
--- 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) {