subject:"\[PHP\-CVS\] cvs\: php\-src\(PHP_5_0\) \/ext\/standard var_unserializer.c var

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

2005-01-17 Thread 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.6r2=1.38.2.7ty=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.6Sun 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.6r2=1.27.2.7ty=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.reMon 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

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

2004-12-03 Thread Stefan Esser

sesser  Fri Dec  3 11:04:10 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
  Log:
  MFH
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.38.2.2r2=1.38.2.3ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.38.2.2 
php-src/ext/standard/var_unserializer.c:1.38.2.3
--- php-src/ext/standard/var_unserializer.c:1.38.2.2Wed Dec  1 17:42:14 2004
+++ php-src/ext/standard/var_unserializer.c Fri Dec  3 11:04:10 2004
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.38.2.2 2004/12/01 22:42:14 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.38.2.3 2004/12/03 16:04:10 sesser Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -205,9 +205,15 @@
 
switch (Z_TYPE_P(key)) {
case IS_LONG:
+   if (zend_hash_index_find(ht, Z_LVAL_P(key), 
(void **)old_data)) {
+   var_replace(var_hash, old_data, rval);
+   }
zend_hash_index_update(ht, Z_LVAL_P(key), 
data, sizeof(data), NULL);
break;
case IS_STRING:
+   if (zend_hash_find(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, (void **)old_data)) {
+   var_replace(var_hash, old_data, rval);
+   }
zend_hash_update(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, data, sizeof(data), NULL);
break;
}
@@ -947,6 +953,8 @@
if (id == -1 || var_access(var_hash, id, rval_ref) != SUCCESS) {
return 0;
}
+   
+   if (*rval == *rval_ref) return 0;
 
if (*rval != NULL) {
zval_ptr_dtor(rval);
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.re?r1=1.27.2.2r2=1.27.2.3ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.27.2.2 
php-src/ext/standard/var_unserializer.re:1.27.2.3
--- php-src/ext/standard/var_unserializer.re:1.27.2.2   Wed Dec  1 17:42:14 2004
+++ php-src/ext/standard/var_unserializer.reFri Dec  3 11:04:10 2004
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.27.2.2 2004/12/01 22:42:14 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.27.2.3 2004/12/03 16:04:10 sesser Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -208,9 +208,15 @@
 
switch (Z_TYPE_P(key)) {
case IS_LONG:
+   if (zend_hash_index_find(ht, Z_LVAL_P(key), 
(void **)old_data)) {
+   var_replace(var_hash, old_data, rval);
+   }
zend_hash_index_update(ht, Z_LVAL_P(key), 
data, sizeof(data), NULL);
break;
case IS_STRING:
+   if (zend_hash_find(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, (void **)old_data)) {
+   var_replace(var_hash, old_data, rval);
+   }
zend_hash_update(ht, Z_STRVAL_P(key), 
Z_STRLEN_P(key) + 1, data, sizeof(data), NULL);
break;
}
@@ -320,6 +326,8 @@
if (id == -1 || var_access(var_hash, id, rval_ref) != SUCCESS) {
return 0;
}
+   
+   if (*rval == *rval_ref) return 0;
 
if (*rval != NULL) {
zval_ptr_dtor(rval);

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

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

2004-12-03 Thread Stefan Esser

sesser  Fri Dec  3 11:10:29 2004 EDT

  Modified files:  (Branch: PHP_5_0)
/php-src/ext/standard   var_unserializer.c var_unserializer.re 
  Log:
  fix compile
  
  
http://cvs.php.net/diff.php/php-src/ext/standard/var_unserializer.c?r1=1.38.2.3r2=1.38.2.4ty=u
Index: php-src/ext/standard/var_unserializer.c
diff -u php-src/ext/standard/var_unserializer.c:1.38.2.3 
php-src/ext/standard/var_unserializer.c:1.38.2.4
--- php-src/ext/standard/var_unserializer.c:1.38.2.3Fri Dec  3 11:04:10 2004
+++ php-src/ext/standard/var_unserializer.c Fri Dec  3 11:10:29 2004
@@ -18,7 +18,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.c,v 1.38.2.3 2004/12/03 16:04:10 sesser Exp $ */
+/* $Id: var_unserializer.c,v 1.38.2.4 2004/12/03 16:10:29 sesser Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -177,7 +177,7 @@
 static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, 
int elements)
 {
while (elements--  0) {
-   zval *key, *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.3r2=1.27.2.4ty=u
Index: php-src/ext/standard/var_unserializer.re
diff -u php-src/ext/standard/var_unserializer.re:1.27.2.3 
php-src/ext/standard/var_unserializer.re:1.27.2.4
--- php-src/ext/standard/var_unserializer.re:1.27.2.3   Fri Dec  3 11:04:10 2004
+++ php-src/ext/standard/var_unserializer.reFri Dec  3 11:10:29 2004
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: var_unserializer.re,v 1.27.2.3 2004/12/03 16:04:10 sesser Exp $ */
+/* $Id: var_unserializer.re,v 1.27.2.4 2004/12/03 16:10:29 sesser Exp $ */
 
 #include php.h
 #include ext/standard/php_var.h
@@ -180,7 +180,7 @@
 static inline int process_nested_data(UNSERIALIZE_PARAMETER, HashTable *ht, 
int elements)
 {
while (elements--  0) {
-   zval *key, *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

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

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

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

3 matches

Site Navigation

Mail list logo

Footer information