From: Stefan Esser <sesser@php.net>
Date: Mon, 17 Jan 2005 11:46:11 +0000 (+0000)
Subject: Fix compiler warning.
X-Git-Tag: php-4.3.11RC1~160
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68b899703c156b6c38d61244b8b2c7a2387b2bd4;p=php

Fix compiler warning.
---

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index fe3728c205..c0b5e73905 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -152,10 +152,10 @@ PHPAPI void var_destroy(php_unserialize_data_t *var_hashx)
 
 
 
-static inline int parse_iv2(const unsigned char *p, const unsigned char **q)
+static inline long parse_iv2(const unsigned char *p, const unsigned char **q)
 {
 	char cursor;
-	int result = 0;
+	long result = 0;
 	int neg = 0;
 
 	switch (*p) {
@@ -180,7 +180,7 @@ static inline int parse_iv2(const unsigned char *p, const unsigned char **q)
 	return result;
 }
 
-static inline int parse_iv(const unsigned char *p)
+static inline long parse_iv(const unsigned char *p)
 {
 	return parse_iv2(p, NULL);
 }
@@ -213,7 +213,7 @@ static inline size_t parse_uiv(const unsigned char *p)
 static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int elements)
 {
 	while (elements-- > 0) {
-		zval *key, *data, *old_data;
+		zval *key, *data, **old_data;
 
 		ALLOC_INIT_ZVAL(key);
 
@@ -279,7 +279,7 @@ static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
 
 static inline int object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 {
-	int elements;
+	long elements;
 
 	elements = parse_iv2((*p) + 2, p);
 
@@ -621,7 +621,7 @@ yy36:	yych = *++YYCURSOR;
 yy37:
 #line 419
 	{
-	int elements = parse_iv(start + 2);
+	long elements = parse_iv(start + 2);
 
 	*p = YYCURSOR;
 
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 9e7867b70e..4495d052b4 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -216,7 +216,7 @@ static inline size_t parse_uiv(const unsigned char *p)
 static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, int elements)
 {
 	while (elements-- > 0) {
-		zval *key, *data, *old_data;
+		zval *key, *data, **old_data;
 
 		ALLOC_INIT_ZVAL(key);