jani Mon Aug 6 18:33:29 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard var_unserializer.c
Log:
Touch generated file
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/var_unserializer.c?r1=1.70.2.4.2.6&r2=1.70.2.4.2.7&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.6
php-src/ext/standard/var_unserializer.c:1.70.2.4.2.7
--- php-src/ext/standard/var_unserializer.c:1.70.2.4.2.6 Mon Jul 9
14:31:56 2007
+++ php-src/ext/standard/var_unserializer.c Mon Aug 6 18:33:29 2007
@@ -1,4 +1,4 @@
-/* Generated by re2c 0.11.2 on Tue Mar 27 13:17:43 2007 */
+/* Generated by re2c 0.12.1 on Mon Aug 6 21:32:14 2007 */
#line 1 "ext/standard/var_unserializer.re"
/*
+----------------------------------------------------------------------+
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: var_unserializer.c,v 1.70.2.4.2.6 2007/07/09 14:31:56 dmitry Exp $ */
+/* $Id: var_unserializer.c,v 1.70.2.4.2.7 2007/08/06 18:33:29 jani Exp $ */
#include "php.h"
#include "ext/standard/php_var.h"
@@ -146,7 +146,7 @@
char *str = safe_emalloc(*len, 1, 1);
unsigned char *end = *(unsigned char **)p+maxlen;
- if(end < *p) {
+ if (end < *p) {
efree(str);
return NULL;
}
@@ -190,7 +190,7 @@
#define YYMARKER marker
-#line 194 "ext/standard/var_unserializer.re"
+#line 198 "ext/standard/var_unserializer.re"
@@ -300,7 +300,7 @@
zval_dtor(key);
FREE_ZVAL(key);
- if (elements && *(*p-1) != ';' && *(*p-1) != '}') {
+ if (elements && *(*p-1) != ';' && *(*p-1) != '}') {
(*p)--;
return 0;
}
@@ -311,7 +311,7 @@
static inline int finish_nested_data(UNSERIALIZE_PARAMETER)
{
- if (*((*p)++) == '}')
+ if (*((*p)++) == '}')
return 1;
#if SOMETHING_NEW_MIGHT_LEAD_TO_CRASH_ENABLE_IF_YOU_ARE_BRAVE
@@ -324,7 +324,7 @@
{
long datalen;
- if(ce->unserialize == NULL) {
+ if (ce->unserialize == NULL) {
zend_error(E_WARNING, "Class %s has no unserializer", ce->name);
return 0;
}
@@ -333,12 +333,12 @@
(*p) += 2;
- if(datalen < 0 || (*p) + datalen >= max) {
- zend_error(E_WARNING, "Insufficient data for unserializing -
%ld required, %d present", datalen, max - (*p));
+ if (datalen < 0 || (*p) + datalen >= max) {
+ zend_error(E_WARNING, "Insufficient data for unserializing -
%ld required, %ld present", datalen, max - (*p));
return 0;
}
- if(ce->unserialize(rval, ce, (const unsigned char*)*p, datalen,
(zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) {
+ if (ce->unserialize(rval, ce, (const unsigned char*)*p, datalen,
(zend_unserialize_data *)var_hash TSRMLS_CC) != SUCCESS) {
return 0;
}
@@ -369,7 +369,7 @@
}
if (Z_OBJCE_PP(rval) != PHP_IC_ENTRY &&
- zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup",
sizeof("__wakeup"))) {
+ zend_hash_exists(&Z_OBJCE_PP(rval)->function_table, "__wakeup",
sizeof("__wakeup"))) {
INIT_PZVAL(&fname);
ZVAL_STRINGL(&fname, "__wakeup", sizeof("__wakeup") - 1, 0);
call_user_function_ex(CG(function_table), rval, &fname,
&retval_ptr, 0, 0, 1, NULL TSRMLS_CC);
@@ -433,7 +433,7 @@
0, 0, 0, 0, 0, 0, 0, 0,
};
-#line 433 "ext/standard/var_unserializer.c"
+#line 437 "ext/standard/var_unserializer.c"
{
YYCTYPE yych;
@@ -459,9 +459,9 @@
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy95;
yy3:
-#line 694 "ext/standard/var_unserializer.re"
+#line 698 "ext/standard/var_unserializer.re"
{ return 0; }
-#line 461 "ext/standard/var_unserializer.c"
+#line 465 "ext/standard/var_unserializer.c"
yy4:
yych = *(YYMARKER = ++YYCURSOR);
if(yych == ':') goto yy89;
@@ -504,13 +504,13 @@
goto yy3;
yy14:
++YYCURSOR;
-#line 688 "ext/standard/var_unserializer.re"
+#line 692 "ext/standard/var_unserializer.re"
{
/* this is the case where we have less data than planned */
php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Unexpected end of
serialized data");
return 0; /* not sure if it should be 0 or 1 here? */
}
-#line 510 "ext/standard/var_unserializer.c"
+#line 514 "ext/standard/var_unserializer.c"
yy16:
yych = *++YYCURSOR;
goto yy3;
@@ -540,7 +540,7 @@
yych = *++YYCURSOR;
if(yych != '"') goto yy18;
++YYCURSOR;
-#line 576 "ext/standard/var_unserializer.re"
+#line 580 "ext/standard/var_unserializer.re"
{
size_t len, len2, len3, maxlen;
long elements;
@@ -556,7 +556,7 @@
zval **args[1];
zval *arg_func_name;
- if(*start == 'C') {
+ if (*start == 'C') {
custom_object = 1;
}
@@ -638,7 +638,7 @@
*p = YYCURSOR;
- if(custom_object) {
+ if (custom_object) {
efree(class_name);
return object_custom(UNSERIALIZE_PASSTHRU, ce);
}
@@ -652,7 +652,7 @@
return object_common2(UNSERIALIZE_PASSTHRU, elements);
}
-#line 652 "ext/standard/var_unserializer.c"
+#line 656 "ext/standard/var_unserializer.c"
yy25:
yych = *++YYCURSOR;
if(yych <= ',') {
@@ -677,7 +677,7 @@
yych = *++YYCURSOR;
if(yych != '"') goto yy18;
++YYCURSOR;
-#line 568 "ext/standard/var_unserializer.re"
+#line 572 "ext/standard/var_unserializer.re"
{
INIT_PZVAL(*rval);
@@ -685,7 +685,7 @@
return object_common2(UNSERIALIZE_PASSTHRU,
object_common1(UNSERIALIZE_PASSTHRU,
ZEND_STANDARD_CLASS_DEF_PTR));
}
-#line 685 "ext/standard/var_unserializer.c"
+#line 689 "ext/standard/var_unserializer.c"
yy32:
yych = *++YYCURSOR;
if(yych == '+') goto yy33;
@@ -706,7 +706,7 @@
yych = *++YYCURSOR;
if(yych != '{') goto yy18;
++YYCURSOR;
-#line 546 "ext/standard/var_unserializer.re"
+#line 550 "ext/standard/var_unserializer.re"
{
long elements = parse_iv(start + 2);
/* use iv() not uiv() in order to check data range */
@@ -728,7 +728,7 @@
return finish_nested_data(UNSERIALIZE_PASSTHRU);
}
-#line 728 "ext/standard/var_unserializer.c"
+#line 732 "ext/standard/var_unserializer.c"
yy39:
yych = *++YYCURSOR;
if(yych == '+') goto yy40;
@@ -749,7 +749,7 @@
yych = *++YYCURSOR;
if(yych != '"') goto yy18;
++YYCURSOR;
-#line 517 "ext/standard/var_unserializer.re"
+#line 521 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -778,7 +778,7 @@
ZVAL_STRINGL(*rval, str, len, 0);
return 1;
}
-#line 778 "ext/standard/var_unserializer.c"
+#line 782 "ext/standard/var_unserializer.c"
yy46:
yych = *++YYCURSOR;
if(yych == '+') goto yy47;
@@ -799,7 +799,7 @@
yych = *++YYCURSOR;
if(yych != '"') goto yy18;
++YYCURSOR;
-#line 489 "ext/standard/var_unserializer.re"
+#line 493 "ext/standard/var_unserializer.re"
{
size_t len, maxlen;
char *str;
@@ -827,7 +827,7 @@
ZVAL_STRINGL(*rval, str, len, 1);
return 1;
}
-#line 827 "ext/standard/var_unserializer.c"
+#line 831 "ext/standard/var_unserializer.c"
yy53:
yych = *++YYCURSOR;
if(yych <= '/') {
@@ -915,14 +915,14 @@
}
yy63:
++YYCURSOR;
-#line 482 "ext/standard/var_unserializer.re"
+#line 486 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_DOUBLE(*rval, zend_strtod((const char *)start + 2, NULL));
return 1;
}
-#line 922 "ext/standard/var_unserializer.c"
+#line 926 "ext/standard/var_unserializer.c"
yy65:
yych = *++YYCURSOR;
if(yych <= ',') {
@@ -981,7 +981,7 @@
yych = *++YYCURSOR;
if(yych != ';') goto yy18;
++YYCURSOR;
-#line 467 "ext/standard/var_unserializer.re"
+#line 471 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
@@ -996,7 +996,7 @@
return 1;
}
-#line 996 "ext/standard/var_unserializer.c"
+#line 1000 "ext/standard/var_unserializer.c"
yy76:
yych = *++YYCURSOR;
if(yych == 'N') goto yy73;
@@ -1023,14 +1023,14 @@
if(yych <= '9') goto yy79;
if(yych != ';') goto yy18;
++YYCURSOR;
-#line 460 "ext/standard/var_unserializer.re"
+#line 464 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_LONG(*rval, parse_iv(start + 2));
return 1;
}
-#line 1030 "ext/standard/var_unserializer.c"
+#line 1034 "ext/standard/var_unserializer.c"
yy83:
yych = *++YYCURSOR;
if(yych <= '/') goto yy18;
@@ -1038,24 +1038,24 @@
yych = *++YYCURSOR;
if(yych != ';') goto yy18;
++YYCURSOR;
-#line 453 "ext/standard/var_unserializer.re"
+#line 457 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_BOOL(*rval, parse_iv(start + 2));
return 1;
}
-#line 1045 "ext/standard/var_unserializer.c"
+#line 1049 "ext/standard/var_unserializer.c"
yy87:
++YYCURSOR;
-#line 446 "ext/standard/var_unserializer.re"
+#line 450 "ext/standard/var_unserializer.re"
{
*p = YYCURSOR;
INIT_PZVAL(*rval);
ZVAL_NULL(*rval);
return 1;
}
-#line 1055 "ext/standard/var_unserializer.c"
+#line 1059 "ext/standard/var_unserializer.c"
yy89:
yych = *++YYCURSOR;
if(yych <= ',') {
@@ -1078,7 +1078,7 @@
if(yych <= '9') goto yy91;
if(yych != ';') goto yy18;
++YYCURSOR;
-#line 423 "ext/standard/var_unserializer.re"
+#line 427 "ext/standard/var_unserializer.re"
{
long id;
@@ -1101,7 +1101,7 @@
return 1;
}
-#line 1101 "ext/standard/var_unserializer.c"
+#line 1105 "ext/standard/var_unserializer.c"
yy95:
yych = *++YYCURSOR;
if(yych <= ',') {
@@ -1124,7 +1124,7 @@
if(yych <= '9') goto yy97;
if(yych != ';') goto yy18;
++YYCURSOR;
-#line 402 "ext/standard/var_unserializer.re"
+#line 406 "ext/standard/var_unserializer.re"
{
long id;
@@ -1145,10 +1145,10 @@
return 1;
}
-#line 1145 "ext/standard/var_unserializer.c"
+#line 1149 "ext/standard/var_unserializer.c"
}
}
-#line 696 "ext/standard/var_unserializer.re"
+#line 700 "ext/standard/var_unserializer.re"
return 0;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
