felipe Sat Oct 4 13:11:36 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/standard var_unserializer.c var_unserializer.re Log: - Fixed compiler warning http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.9&r2=1.70.2.4.2.10&diff_format=u Index: php-src/ext/standard/var_unserializer.c diff -u php-src/ext/standard/var_unserializer.c:1.70.2.4.2.9 php-src/ext/standard/var_unserializer.c:1.70.2.4.2.10 --- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.9 Wed Jul 16 14:26:30 2008 +++ php-src/ext/standard/var_unserializer.c Sat Oct 4 13:11:36 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Wed Jul 16 17:25:51 2008 */ +/* Generated by re2c 0.13.5 on Sat Oct 4 10:07:18 2008 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c,v 1.70.2.4.2.9 2008/07/16 14:26:30 jani Exp $ */ +/* $Id: var_unserializer.c,v 1.70.2.4.2.10 2008/10/04 13:11:36 felipe Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -334,7 +334,7 @@ (*p) += 2; if (datalen < 0 || (*p) + datalen >= max) { - zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p)); + zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.7&r2=1.52.2.2.2.8&diff_format=u Index: php-src/ext/standard/var_unserializer.re diff -u php-src/ext/standard/var_unserializer.re:1.52.2.2.2.7 php-src/ext/standard/var_unserializer.re:1.52.2.2.2.8 --- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.7 Wed Mar 19 03:00:40 2008 +++ php-src/ext/standard/var_unserializer.re Sat Oct 4 13:11:36 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.re,v 1.52.2.2.2.7 2008/03/19 03:00:40 felipe Exp $ */ +/* $Id: var_unserializer.re,v 1.52.2.2.2.8 2008/10/04 13:11:36 felipe Exp $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -338,7 +338,7 @@ (*p) += 2; if (datalen < 0 || (*p) + datalen >= max) { - zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, max - (*p)); + zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (long)(max - (*p))); return 0; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php