mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix zend_longo_str

Browse Source
This commit is contained in:
Nikita Popov 2014-08-25 22:47:04 +02:00
parent 46b53e815c
commit 28e7beea66
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_operators.c
View File

@ -604,7 +604,7 @@ ZEND_API void _convert_to_string(zval *op ZEND_FILE_LINE_DC) /* {{{ */
break;
}
case IS_LONG: {
ZVAL_NEW_STR(op, zend_longo_str(Z_LVAL_P(op)));
ZVAL_NEW_STR(op, zend_long_to_str(Z_LVAL_P(op)));
break;
}
case IS_DOUBLE: {
@ -883,7 +883,7 @@ try_again:
return zend_string_init(buf, len, 0);
}
case IS_LONG: {
return zend_longo_str(Z_LVAL_P(op));
return zend_long_to_str(Z_LVAL_P(op));
}
case IS_DOUBLE: {
return zend_strpprintf(0, "%.*G", (int) EG(precision), Z_DVAL_P(op));
@ -2558,7 +2558,7 @@ ZEND_API void zend_locale_sprintf_double(zval *op ZEND_FILE_LINE_DC) /* {{{ */
}
/* }}} */
ZEND_API zend_string *zend_longo_str(zend_long num) /* {{{ */
ZEND_API zend_string *zend_long_to_str(zend_long num) /* {{{ */
{
char buf[MAX_LENGTH_OF_LONG + 1];
char *res;

2
Zend/zend_operators.h
View File

@ -1045,7 +1045,7 @@ static zend_always_inline void fast_is_not_identical_function(zval *result, zval
} \
} while (0)
ZEND_API zend_string *zend_longo_str(zend_long num);
ZEND_API zend_string *zend_long_to_str(zend_long num);
#endif

2
ext/curl/interface.c
View File

@ -2476,7 +2476,7 @@ static int _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue TSRMLS_
char *postval;
/* Pretend we have a string_key here */
if (!string_key) {
string_key = zend_longo_str(num_key);
string_key = zend_long_to_str(num_key);
} else {
zend_string_addref(string_key);
}

2
ext/pcntl/pcntl.c
View File

@ -788,7 +788,7 @@ PHP_FUNCTION(pcntl_exec)
ZEND_HASH_FOREACH_KEY_VAL(envs_hash, key_num, key, element) {
if (envi >= envc) break;
if (!key) {
key = zend_longo_str(key_num);
key = zend_long_to_str(key_num);
} else {
zend_string_addref(key);
}

6
ext/wddx/wddx.c
View File

@ -300,7 +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 = zend_longo_str(idx);
key = zend_long_to_str(idx);
} else {
zend_string_addref(key);
}
@ -512,7 +512,7 @@ static void php_wddx_serialize_object(wddx_packet *packet, zval *obj)
php_wddx_serialize_var(packet, ent, tmp TSRMLS_CC);
zend_string_release(tmp);
} else {
key = zend_longo_str(idx);
key = zend_long_to_str(idx);
php_wddx_serialize_var(packet, ent, key TSRMLS_CC);
zend_string_release(key);
}
@ -568,7 +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 = zend_longo_str(idx);
key = zend_long_to_str(idx);
php_wddx_serialize_var(packet, ent, key TSRMLS_CC);
zend_string_release(key);
}