[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard var_unserializer.c var_unserializer.re

[Stefan Esser]

sesser          Mon Jan 17 06:46:12 2005 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/standard       var_unserializer.c var_unserializer.re 
  Log:
  Fix compiler warning.
  
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.18.4.15&r2=1.18.4.16&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.18.4.15 
php-src/ext/standard/var_unserializer.c:1.18.4.16
--- php-src/ext/standard/var_unserializer.c:1.18.4.15   Sat Jan 15 13:44:29 2005
+++ php-src/ext/standard/var_unserializer.c     Mon Jan 17 06:46:11 2005
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.c,v 1.18.4.15 2005/01/15 18:44:29 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.18.4.16 2005/01/17 11:46:11 sesser Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -152,10 +152,10 @@
 
 
 
-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 @@
        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 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 object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 {
-       int elements;
+       long elements;
 
        elements = parse_iv2((*p) + 2, p);
 
@@ -621,7 +621,7 @@
 yy37:
 #line 419
        {
-       int elements = parse_iv(start + 2);
+       long elements = parse_iv(start + 2);
 
        *p = YYCURSOR;
 
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.11.4.9&r2=1.11.4.10&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.11.4.9 
php-src/ext/standard/var_unserializer.re:1.11.4.10
--- php-src/ext/standard/var_unserializer.re:1.11.4.9   Sat Jan 15 13:44:29 2005
+++ php-src/ext/standard/var_unserializer.re    Mon Jan 17 06:46:11 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.re,v 1.11.4.9 2005/01/15 18:44:29 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.11.4.10 2005/01/17 11:46:11 sesser Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -216,7 +216,7 @@
 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);
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php