com php-src: Use zend_long_to_str in wddx: ext/wd dx/wddx.c
| From: | Nikita Popov | Date: | Wed, 28 May 2014 16:55:51 +0000 |
| Subject: | com php-src: Use zend_long_to_str in wddx: ext/wd dx/wddx.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78616@lists.php.net to get a copy of this message | ||
Commit: 9e2bc83fdbaa37ccc2b38ec36b3d49a96376ba93
Author: Nikita Popov <nikic@php.net> Wed, 28 May 2014 18:55:51 +0200
Parents: 3831b39302bbe0757e830d6a76a2a9b9c4a8efc7
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9e2bc83fdbaa37ccc2b38ec36b3d49a96376ba93
Log:
Use zend_long_to_str in wddx
Changed paths:
M ext/wddx/wddx.c
Diff:
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index 3b4357a..dc7ea83 100644
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -300,8 +300,7 @@ PS_SERIALIZER_DECODE_FUNC(wddx)
if ((ret = php_wddx_deserialize_ex(val, vallen, &retval)) == SUCCESS) {
ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL(retval), idx, key, ent) {
if (key == NULL) {
- key = STR_ALLOC(MAX_LENGTH_OF_LONG, 0);
- key->len = snprintf(key->val, key->len + 1, "%ld", idx);
+ key = zend_long_to_str(idx);
} else {
STR_ADDREF(key);
}
@@ -513,8 +512,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
php_wddx_serialize_var(packet, ent, tmp TSRMLS_CC);
STR_RELEASE(tmp);
} else {
- key = STR_ALLOC(MAX_LENGTH_OF_LONG, 0);
- key->len = snprintf(key->val, key->len + 1, "%ld", idx);
+ key = zend_long_to_str(idx);
php_wddx_serialize_var(packet, ent, key TSRMLS_CC);
STR_RELEASE(key);
}
@@ -570,8 +568,7 @@ static void php_wddx_serialize_array(wddx_packet *packet, zval *arr)
if (key) {
php_wddx_serialize_var(packet, ent, key TSRMLS_CC);
} else {
- key = STR_ALLOC(MAX_LENGTH_OF_LONG, 0);
- key->len = snprintf(key->val, key->len + 1, "%ld", idx);
+ key = zend_long_to_str(idx);
php_wddx_serialize_var(packet, ent, key TSRMLS_CC);
STR_RELEASE(key);
}