From: Nikita Popov <nikic@php.net>
Date: Mon, 25 Aug 2014 20:47:04 +0000 (+0200)
Subject: Fix zend_longo_str
X-Git-Tag: PRE_PHP7_REMOVALS~330
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28e7beea66760ca0c175ccd908a77429d122da00;p=php

Fix zend_longo_str
---

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 6330397303..13fea34caf 100644
--- 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 a5b324e8b9..c308777e95 100644
--- 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 273d05f817..e041eef12d 100644
--- 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 206f0feaa4..30ffb309b3 100644
--- 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 e141a02688..3318909bf2 100644
--- 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);
 			}