From 58b20e71d1bcb8855fb61ad622cbb7ab904bebc5 Mon Sep 17 00:00:00 2001 From: Stefan Esser Date: Mon, 17 Jan 2005 12:13:33 +0000 Subject: [PATCH] MFH: 64bit fix + compiler warning fix --- ext/standard/var_unserializer.c | 8 ++++---- ext/standard/var_unserializer.re | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 0e94b55fa3..2a808de1cd 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); diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index b1fc58b52e..9dd77165dd 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -155,10 +155,10 @@ any = [\000-\277]; -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) { @@ -183,7 +183,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); } @@ -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); -- 2.50.1