tony2001 Tue Mar 27 09:29:10 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard var_unserializer.re var_unserializer.c
Log:
MFH: fix compile warning
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.re?r1=1.52.2.2.2.2&r2=1.52.2.2.2.3&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.2
php-src/ext/standard/var_unserializer.re:1.52.2.2.2.3
--- php-src/ext/standard/var_unserializer.re:1.52.2.2.2.2 Fri Mar 23
20:15:21 2007
+++ php-src/ext/standard/var_unserializer.re Tue Mar 27 09:29:10 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.re,v 1.52.2.2.2.2 2007/03/23 20:15:21 stas Exp $ */
+/* $Id: var_unserializer.re,v 1.52.2.2.2.3 2007/03/27 09:29:10 tony2001 Exp $
*/
#include "php.h"
#include "ext/standard/php_var.h"
@@ -142,7 +142,7 @@
{
size_t i, j;
char *str = safe_emalloc(*len, 1, 1);
- unsigned char *end = *p+*len;
+ unsigned char *end = *(unsigned char **)p+*len;
if(end < *p) {
efree(str);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.4&r2=1.70.2.4.2.5&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.4
php-src/ext/standard/var_unserializer.c:1.70.2.4.2.5
--- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.4 Fri Mar 23
20:28:40 2007
+++ php-src/ext/standard/var_unserializer.c Tue Mar 27 09:29:10 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.0 on Fri Mar 23 20:26:08 2007 */
+/* Generated by re2c 0.11.2 on Tue Mar 27 13:17:43 2007 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.70.2.4.2.4 2007/03/23 20:28:40 nlopess Exp $ */
+/* $Id: var_unserializer.c,v 1.70.2.4.2.5 2007/03/27 09:29:10 tony2001 Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -144,7 +144,7 @@
{
size_t i, j;
char *str = safe_emalloc(*len, 1, 1);
- unsigned char *end = *p+*len;
+ unsigned char *end = *(unsigned char **)p+*len;
if(end < *p) {
efree(str);
@@ -394,7 +394,7 @@
{
- static unsigned char yybm[] = {
+ static const unsigned char yybm[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
