fixes to %pd format usage

1 files changed, 33 insertions, 1 deletions

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 810f3c8f8c..b4be2cc26d 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -1,4 +1,5 @@
 /* Generated by re2c 0.13.5 */
+#line 1 "ext/standard/var_unserializer.re"
 /*
   +----------------------------------------------------------------------+
   | PHP Version 5                                                        |
@@ -232,6 +233,7 @@ static zend_string *unserialize_str(const unsigned char **p, size_t len, size_t
 #define YYMARKER marker
 
 
+#line 241 "ext/standard/var_unserializer.re"
 
 
 
@@ -385,7 +387,7 @@ static inline int object_custom(UNSERIALIZE_PARAMETER, zend_class_entry *ce)
 	(*p) += 2;
 
 	if (datalen < 0 || (*p) + datalen >= max) {
-		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %ld present", datalen, (php_int_t)(max - (*p)));
+		zend_error(E_WARNING, "Insufficient data for unserializing - %ld required, %pd present", datalen, (php_int_t)(max - (*p)));
 		return 0;
 	}
 
@@ -479,6 +481,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER)
 	start = cursor;
 
 
+#line 485 "ext/standard/var_unserializer.c"
 {
 	YYCTYPE yych;
 	static const unsigned char yybm[] = {
@@ -538,7 +541,9 @@ yy2:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy95;
 yy3:
+#line 826 "ext/standard/var_unserializer.re"
 	{ return 0; }
+#line 547 "ext/standard/var_unserializer.c"
 yy4:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy89;
@@ -581,11 +586,13 @@ yy13:
 	goto yy3;
 yy14:
 	++YYCURSOR;
+#line 820 "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 596 "ext/standard/var_unserializer.c"
 yy16:
 	yych = *++YYCURSOR;
 	goto yy3;
@@ -615,6 +622,7 @@ yy20:
 	yych = *++YYCURSOR;
 	if (yych != '"') goto yy18;
 	++YYCURSOR;
+#line 681 "ext/standard/var_unserializer.re"
 	{
 	size_t len, len2, len3, maxlen;
 	php_int_t elements;
@@ -753,6 +761,7 @@ yy20:
 
 	return object_common2(UNSERIALIZE_PASSTHRU, elements);
 }
+#line 765 "ext/standard/var_unserializer.c"
 yy25:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
@@ -777,6 +786,7 @@ yy27:
 	yych = *++YYCURSOR;
 	if (yych != '"') goto yy18;
 	++YYCURSOR;
+#line 673 "ext/standard/var_unserializer.re"
 	{
 
 //???	INIT_PZVAL(rval);
@@ -784,6 +794,7 @@ yy27:
 	return object_common2(UNSERIALIZE_PASSTHRU,
 			object_common1(UNSERIALIZE_PASSTHRU, ZEND_STANDARD_CLASS_DEF_PTR));
 }
+#line 798 "ext/standard/var_unserializer.c"
 yy32:
 	yych = *++YYCURSOR;
 	if (yych == '+') goto yy33;
@@ -804,6 +815,7 @@ yy34:
 	yych = *++YYCURSOR;
 	if (yych != '{') goto yy18;
 	++YYCURSOR;
+#line 652 "ext/standard/var_unserializer.re"
 	{
 	php_int_t elements = parse_iv(start + 2);
 	/* use iv() not uiv() in order to check data range */
@@ -824,6 +836,7 @@ yy34:
 
 	return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
+#line 840 "ext/standard/var_unserializer.c"
 yy39:
 	yych = *++YYCURSOR;
 	if (yych == '+') goto yy40;
@@ -844,6 +857,7 @@ yy41:
 	yych = *++YYCURSOR;
 	if (yych != '"') goto yy18;
 	++YYCURSOR;
+#line 624 "ext/standard/var_unserializer.re"
 	{
 	size_t len, maxlen;
 	zend_string *str;
@@ -871,6 +885,7 @@ yy41:
 	ZVAL_STR(rval, str);
 	return 1;
 }
+#line 889 "ext/standard/var_unserializer.c"
 yy46:
 	yych = *++YYCURSOR;
 	if (yych == '+') goto yy47;
@@ -891,6 +906,7 @@ yy48:
 	yych = *++YYCURSOR;
 	if (yych != '"') goto yy18;
 	++YYCURSOR;
+#line 597 "ext/standard/var_unserializer.re"
 	{
 	size_t len, maxlen;
 	char *str;
@@ -917,6 +933,7 @@ yy48:
 	ZVAL_STRINGL(rval, str, len);
 	return 1;
 }
+#line 937 "ext/standard/var_unserializer.c"
 yy53:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
@@ -1004,6 +1021,7 @@ yy61:
 	}
 yy63:
 	++YYCURSOR;
+#line 588 "ext/standard/var_unserializer.re"
 	{
 #if SIZEOF_ZEND_INT == 4
 use_double:
@@ -1012,6 +1030,7 @@ use_double:
 	ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
 	return 1;
 }
+#line 1034 "ext/standard/var_unserializer.c"
 yy65:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
@@ -1070,6 +1089,7 @@ yy73:
 	yych = *++YYCURSOR;
 	if (yych != ';') goto yy18;
 	++YYCURSOR;
+#line 572 "ext/standard/var_unserializer.re"
 	{
 	*p = YYCURSOR;
 
@@ -1085,6 +1105,7 @@ yy73:
 
 	return 1;
 }
+#line 1109 "ext/standard/var_unserializer.c"
 yy76:
 	yych = *++YYCURSOR;
 	if (yych == 'N') goto yy73;
@@ -1111,6 +1132,7 @@ yy79:
 	if (yych <= '9') goto yy79;
 	if (yych != ';') goto yy18;
 	++YYCURSOR;
+#line 546 "ext/standard/var_unserializer.re"
 	{
 #if SIZEOF_ZEND_INT == 4
 	int digits = YYCURSOR - start - 3;
@@ -1136,6 +1158,7 @@ yy79:
 	ZVAL_INT(rval, parse_iv(start + 2));
 	return 1;
 }
+#line 1162 "ext/standard/var_unserializer.c"
 yy83:
 	yych = *++YYCURSOR;
 	if (yych <= '/') goto yy18;
@@ -1143,18 +1166,22 @@ yy83:
 	yych = *++YYCURSOR;
 	if (yych != ';') goto yy18;
 	++YYCURSOR;
+#line 540 "ext/standard/var_unserializer.re"
 	{
 	*p = YYCURSOR;
 	ZVAL_BOOL(rval, parse_iv(start + 2));
 	return 1;
 }
+#line 1176 "ext/standard/var_unserializer.c"
 yy87:
 	++YYCURSOR;
+#line 534 "ext/standard/var_unserializer.re"
 	{
 	*p = YYCURSOR;
 	ZVAL_NULL(rval);
 	return 1;
 }
+#line 1185 "ext/standard/var_unserializer.c"
 yy89:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
@@ -1177,6 +1204,7 @@ yy91:
 	if (yych <= '9') goto yy91;
 	if (yych != ';') goto yy18;
 	++YYCURSOR;
+#line 511 "ext/standard/var_unserializer.re"
 	{
 	php_int_t id;
 
@@ -1199,6 +1227,7 @@ yy91:
 	
 	return 1;
 }
+#line 1231 "ext/standard/var_unserializer.c"
 yy95:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
@@ -1221,6 +1250,7 @@ yy97:
 	if (yych <= '9') goto yy97;
 	if (yych != ';') goto yy18;
 	++YYCURSOR;
+#line 489 "ext/standard/var_unserializer.re"
 	{
 	php_int_t id;
 
@@ -1242,7 +1272,9 @@ yy97:
 	
 	return 1;
 }
+#line 1276 "ext/standard/var_unserializer.c"
 }
+#line 828 "ext/standard/var_unserializer.re"
 
 
 	return 0;