ext/random: Reduce scope of variables

Author: Girgias

ext/random/engine_mt19937.c

@@ -127,15 +127,15 @@ static inline void mt19937_reload(php_random_status_state_mt19937 *state)
 
 PHPAPI inline void php_random_mt19937_seed32(php_random_status_state_mt19937 *state, uint32_t seed)
 {
-	uint32_t i, prev_state;
+	uint32_t i;
 
 	/* Initialize generator state with seed
 	   See Knuth TAOCP Vol 2, 3rd Ed, p.106 for multiplier.
 	   In previous versions, most significant bits (MSBs) of the seed affect
 	   only MSBs of the state array.  Modified 9 Jan 2002 by Makoto Matsumoto. */
 	state->state[0] = seed;
 	for (i = 1; i < N; i++) {
-		prev_state = state->state[i - 1];
+		uint32_t prev_state = state->state[i - 1];
 		state->state[i] = (1812433253U * (prev_state  ^ (prev_state  >> 30)) + i) & 0xffffffffU;
 	}
 	state->count = i;

ext/random/engine_pcgoneseq128xslrr64.c

@@ -84,15 +84,14 @@ static bool unserialize(void *state, HashTable *data)
 {
 	php_random_status_state_pcgoneseq128xslrr64 *s = state;
 	uint64_t u[2];
-	zval *t;
 
 	/* Verify the expected number of elements, this implicitly ensures that no additional elements are present. */
 	if (zend_hash_num_elements(data) != 2) {
 		return false;
 	}
 
 	for (uint32_t i = 0; i < 2; i++) {
-		t = zend_hash_index_find(data, i);
+		zval *t = zend_hash_index_find(data, i);
 		if (!t || Z_TYPE_P(t) != IS_STRING || Z_STRLEN_P(t) != (2 * sizeof(uint64_t))) {
 			return false;
 		}

ext/random/engine_xoshiro256starstar.c

@@ -134,15 +134,14 @@ static bool serialize(void *state, HashTable *data)
 static bool unserialize(void *state, HashTable *data)
 {
 	php_random_status_state_xoshiro256starstar *s = state;
-	zval *t;
 
 	/* Verify the expected number of elements, this implicitly ensures that no additional elements are present. */
 	if (zend_hash_num_elements(data) != 4) {
 		return false;
 	}
 
 	for (uint32_t i = 0; i < 4; i++) {
-		t = zend_hash_index_find(data, i);
+		zval *t = zend_hash_index_find(data, i);
 		if (!t || Z_TYPE_P(t) != IS_STRING || Z_STRLEN_P(t) != (2 * sizeof(uint64_t))) {
 			return false;
 		}

ext/random/randomizer.c

@@ -381,7 +381,7 @@ PHP_METHOD(Random_Randomizer, shuffleBytes)
 PHP_METHOD(Random_Randomizer, pickArrayKeys)
 {
 	php_random_randomizer *randomizer = Z_RANDOM_RANDOMIZER_P(ZEND_THIS);
-	zval *input, t;
+	zval *input;
 	zend_long num_req;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2);
@@ -401,6 +401,7 @@ PHP_METHOD(Random_Randomizer, pickArrayKeys)
 
 	/* Keep compatibility, But the result is always an array */
 	if (Z_TYPE_P(return_value) != IS_ARRAY) {
+		zval t;
 		ZVAL_COPY_VALUE(&t, return_value);
 		array_init(return_value);
 		zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);