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

[Stefan Esser]

sesser          Mon Jan 17 07:13:35 2005 EDT

  Modified files:              (Branch: PHP_5_0)
    /php-src/ext/standard       var_unserializer.c var_unserializer.re 
  Log:
  MFH: 64bit fix + compiler warning fix
  
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.38.2.6&r2=1.38.2.7&ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.38.2.6 
php-src/ext/standard/var_unserializer.c:1.38.2.7
--- php-src/ext/standard/var_unserializer.c:1.38.2.6    Sun Jan 16 17:02:50 2005
+++ php-src/ext/standard/var_unserializer.c     Mon Jan 17 07:13:32 2005
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.c,v 1.38.2.6 2005/01/16 22:02:50 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.38.2.7 2005/01/17 12:13:32 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);
 
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.27.2.6&r2=1.27.2.7&ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.27.2.6 
php-src/ext/standard/var_unserializer.re:1.27.2.7
--- php-src/ext/standard/var_unserializer.re:1.27.2.6   Sun Jan 16 17:02:50 2005
+++ php-src/ext/standard/var_unserializer.re    Mon Jan 17 07:13:33 2005
@@ -16,7 +16,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: var_unserializer.re,v 1.27.2.6 2005/01/16 22:02:50 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.27.2.7 2005/01/17 12:13:33 sesser Exp $ */
 
 #include "php.h"
 #include "ext/standard/php_var.h"
@@ -155,10 +155,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) {
@@ -183,7 +183,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);
 }
@@ -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