Fix compiler warning.

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index fe3728c205f2091ea596e5c60abc6419982def83..c0b5e73905572f2da80f3cdd3ab806cf000194ff 100644 (file)
--- 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 9e7867b70e63e45f8f5d3c069b20c9ae82a00208..4495d052b41c020f457fc3af6b21da8fdd1e55a3 100644 (file)
--- 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);