Fix zend_longo_str

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 633039730390f070d7790488868d3e872a13d22e..13fea34caffc4f1179feb018f1a4a4be9532b453 100644 (file)
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -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;

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index a5b324e8b9eac1aa5f4b3e71d262560149963b43..c308777e95068c75ecc19864f69561b35d03630d 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -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
 

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 273d05f8172a1c4e813426ef7745d0e08bb2a9ad..e041eef12dc5ab5723a701ad0c0023d203fc9a13 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -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);
                                        }

diff --git a/ext/pcntl/pcntl.c b/ext/pcntl/pcntl.c
index 206f0feaa434fdd611a75b966cb88be5dc8873ce..30ffb309b367a1ba8158164f1cf5f8e78232a136 100644 (file)
--- a/ext/pcntl/pcntl.c
+++ b/ext/pcntl/pcntl.c
@@ -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);
                        }

diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
index e141a026883744462608294c28797be44b899f92..3318909bf20b8b39adfb8d82ec58c570472876da 100644 (file)
--- a/ext/wddx/wddx.c
+++ b/ext/wddx/wddx.c
@@ -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);
                        }