ext/standard/array.c: Use more appropriate type

Author: Girgias

ext/standard/array.c

@@ -3806,7 +3806,7 @@ PHP_FUNCTION(array_splice)
 		/* ..and the length */
 		if (length < 0) {
 			size = num_in - offset + length;
-		} else if (((zend_ulong) offset + (zend_ulong) length) > (uint32_t) num_in) {
+		} else if (((zend_ulong) offset + (zend_ulong) length) > num_in) {
 			size = num_in - offset;
 		}
 
@@ -6729,12 +6729,11 @@ PHP_FUNCTION(array_all)
 PHP_FUNCTION(array_map)
 {
 	zval *arrays = NULL;
-	int n_arrays = 0;
+	uint32_t n_arrays = 0;
 	zval result;
 	zend_fcall_info fci = empty_fcall_info;
 	zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
-	int i;
-	uint32_t k, maxlen = 0;
+	uint32_t maxlen = 0;
 
 	ZEND_PARSE_PARAMETERS_START(2, -1)
 		Z_PARAM_FUNC_OR_NULL(fci, fci_cache)
@@ -6745,7 +6744,6 @@ PHP_FUNCTION(array_map)
 		zend_ulong num_key;
 		zend_string *str_key;
 		zval *zv, arg;
-		int ret;
 
 		if (Z_TYPE(arrays[0]) != IS_ARRAY) {
 			zend_argument_type_error(2, "must be of type array, %s given", zend_zval_value_name(&arrays[0]));
@@ -6767,7 +6765,7 @@ PHP_FUNCTION(array_map)
 			fci.params = &arg;
 
 			ZVAL_COPY(&arg, zv);
-			ret = zend_call_function(&fci, &fci_cache);
+			zend_result ret = zend_call_function(&fci, &fci_cache);
 			i_zval_ptr_dtor(&arg);
 			if (ret != SUCCESS || Z_TYPE(result) == IS_UNDEF) {
 				zend_array_destroy(Z_ARR_P(return_value));
@@ -6782,7 +6780,7 @@ PHP_FUNCTION(array_map)
 	} else {
 		uint32_t *array_pos = (HashPosition *)ecalloc(n_arrays, sizeof(HashPosition));
 
-		for (i = 0; i < n_arrays; i++) {
+		for (uint32_t i = 0; i < n_arrays; i++) {
 			if (Z_TYPE(arrays[i]) != IS_ARRAY) {
 				zend_argument_type_error(i + 2, "must be of type array, %s given", zend_zval_value_name(&arrays[i]));
 				efree(array_pos);
@@ -6799,13 +6797,13 @@ PHP_FUNCTION(array_map)
 			zval zv;
 
 			/* We iterate through all the arrays at once. */
-			for (k = 0; k < maxlen; k++) {
+			for (uint32_t k = 0; k < maxlen; k++) {
 
 				/* If no callback, the result will be an array, consisting of current
 				 * entries from all arrays. */
 				array_init_size(&result, n_arrays);
 
-				for (i = 0; i < n_arrays; i++) {
+				for (uint32_t i = 0; i < n_arrays; i++) {
 					/* If this array still has elements, add the current one to the
 					 * parameter list, otherwise use null value. */
 					uint32_t pos = array_pos[i];
@@ -6843,8 +6841,8 @@ PHP_FUNCTION(array_map)
 			zval *params = (zval *)safe_emalloc(n_arrays, sizeof(zval), 0);
 
 			/* We iterate through all the arrays at once. */
-			for (k = 0; k < maxlen; k++) {
-				for (i = 0; i < n_arrays; i++) {
+			for (uint32_t k = 0; k < maxlen; k++) {
+				for (uint32_t i = 0; i < n_arrays; i++) {
 					/* If this array still has elements, add the current one to the
 					 * parameter list, otherwise use null value. */
 					uint32_t pos = array_pos[i];
@@ -6882,13 +6880,13 @@ PHP_FUNCTION(array_map)
 				if (zend_call_function(&fci, &fci_cache) != SUCCESS || Z_TYPE(result) == IS_UNDEF) {
 					efree(array_pos);
 					zend_array_destroy(Z_ARR_P(return_value));
-					for (i = 0; i < n_arrays; i++) {
+					for (uint32_t i = 0; i < n_arrays; i++) {
 						zval_ptr_dtor(&params[i]);
 					}
 					efree(params);
 					RETURN_NULL();
 				} else {
-					for (i = 0; i < n_arrays; i++) {
+					for (uint32_t i = 0; i < n_arrays; i++) {
 						zval_ptr_dtor(&params[i]);
 					}
 				}
@@ -6947,7 +6945,6 @@ PHP_FUNCTION(array_key_exists)
 /* {{{ Split array into chunks */
 PHP_FUNCTION(array_chunk)
 {
-	int num_in;
 	zend_long size, current = 0;
 	zend_string *str_key;
 	zend_ulong num_key;
@@ -6969,7 +6966,7 @@ PHP_FUNCTION(array_chunk)
 		RETURN_THROWS();
 	}
 
-	num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
+	uint32_t num_in = zend_hash_num_elements(Z_ARRVAL_P(input));
 
 	if (size > num_in) {
 		if (num_in == 0) {
@@ -7021,15 +7018,14 @@ PHP_FUNCTION(array_combine)
 	HashTable *values, *keys;
 	uint32_t pos_values = 0;
 	zval *entry_keys, *entry_values;
-	int num_keys, num_values;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_ARRAY_HT(keys)
 		Z_PARAM_ARRAY_HT(values)
 	ZEND_PARSE_PARAMETERS_END();
 
-	num_keys = zend_hash_num_elements(keys);
-	num_values = zend_hash_num_elements(values);
+	uint32_t num_keys = zend_hash_num_elements(keys);
+	uint32_t num_values = zend_hash_num_elements(values);
 
 	if (num_keys != num_values) {
 		zend_argument_value_error(1, "and argument #2 ($values) must have the same number of elements");