pajoye Sun, 06 Jun 2010 15:28:30 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=300229
Log:
- silent warning (unary minus operator applied to unsigned type)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/var.c
U php/php-src/trunk/ext/standard/var.c
Modified: php/php-src/branches/PHP_5_3/ext/standard/var.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/var.c 2010-06-06 14:49:36 UTC
(rev 300228)
+++ php/php-src/branches/PHP_5_3/ext/standard/var.c 2010-06-06 15:28:30 UTC
(rev 300229)
@@ -532,7 +532,7 @@
PHP_SET_CLASS_ATTRIBUTES(struc);
smart_str_appendl(buf, "O:", 2);
- smart_str_append_long(buf, name_len);
+ smart_str_append_long(buf, (long)name_len);
smart_str_appendl(buf, ":\"", 2);
smart_str_appendl(buf, class_name, name_len);
smart_str_appendl(buf, "\":", 2);
@@ -639,12 +639,12 @@
if (var_hash && php_add_var_hash(var_hash, struc, (void *) &var_already
TSRMLS_CC) == FAILURE) {
if (Z_ISREF_P(struc)) {
smart_str_appendl(buf, "R:", 2);
- smart_str_append_long(buf, *var_already);
+ smart_str_append_long(buf, (long)*var_already);
smart_str_appendc(buf, ';');
return;
} else if (Z_TYPE_P(struc) == IS_OBJECT) {
smart_str_appendl(buf, "r:", 2);
- smart_str_append_long(buf, *var_already);
+ smart_str_append_long(buf, (long)*var_already);
smart_str_appendc(buf, ';');
return;
}
@@ -698,12 +698,12 @@
if (ce->serialize(struc,
&serialized_data, &serialized_length, (zend_serialize_data *)var_hash
TSRMLS_CC) == SUCCESS) {
smart_str_appendl(buf, "C:", 2);
- smart_str_append_long(buf,
Z_OBJCE_P(struc)->name_length);
+ smart_str_append_long(buf,
(long)Z_OBJCE_P(struc)->name_length);
smart_str_appendl(buf, ":\"",
2);
smart_str_appendl(buf,
Z_OBJCE_P(struc)->name, Z_OBJCE_P(struc)->name_length);
smart_str_appendl(buf, "\":",
2);
- smart_str_append_long(buf,
serialized_length);
+ smart_str_append_long(buf,
(long)serialized_length);
smart_str_appendl(buf, ":{", 2);
smart_str_appendl(buf,
serialized_data, serialized_length);
smart_str_appendc(buf, '}');
Modified: php/php-src/trunk/ext/standard/var.c
===================================================================
--- php/php-src/trunk/ext/standard/var.c 2010-06-06 14:49:36 UTC (rev
300228)
+++ php/php-src/trunk/ext/standard/var.c 2010-06-06 15:28:30 UTC (rev
300229)
@@ -538,7 +538,7 @@
PHP_SET_CLASS_ATTRIBUTES(struc);
smart_str_appendl(buf, "O:", 2);
- smart_str_append_long(buf, name_len);
+ smart_str_append_long(buf, (long)name_len);
smart_str_appendl(buf, ":\"", 2);
smart_str_appendl(buf, class_name, name_len);
smart_str_appendl(buf, "\":", 2);
@@ -645,12 +645,12 @@
if (var_hash && php_add_var_hash(var_hash, struc, (void *) &var_already
TSRMLS_CC) == FAILURE) {
if (Z_ISREF_P(struc)) {
smart_str_appendl(buf, "R:", 2);
- smart_str_append_long(buf, *var_already);
+ smart_str_append_long(buf, (long)*var_already);
smart_str_appendc(buf, ';');
return;
} else if (Z_TYPE_P(struc) == IS_OBJECT) {
smart_str_appendl(buf, "r:", 2);
- smart_str_append_long(buf, *var_already);
+ smart_str_append_long(buf, (long)*var_already);
smart_str_appendc(buf, ';');
return;
}
@@ -704,12 +704,12 @@
if (ce->serialize(struc,
&serialized_data, &serialized_length, (zend_serialize_data *)var_hash
TSRMLS_CC) == SUCCESS) {
smart_str_appendl(buf, "C:", 2);
- smart_str_append_long(buf,
Z_OBJCE_P(struc)->name_length);
+ smart_str_append_long(buf,
(long)Z_OBJCE_P(struc)->name_length);
smart_str_appendl(buf, ":\"",
2);
smart_str_appendl(buf,
Z_OBJCE_P(struc)->name, Z_OBJCE_P(struc)->name_length);
smart_str_appendl(buf, "\":",
2);
- smart_str_append_long(buf,
serialized_length);
+ smart_str_append_long(buf,
(long)serialized_length);
smart_str_appendl(buf, ":{", 2);
smart_str_appendl(buf,
serialized_data, serialized_length);
smart_str_appendc(buf, '}');
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
