Removed unused functions

diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index 8a58f3791ed7bc057366d31a16a9a75e551d9c41..3475174513724d86c299f34e06fa541e7bebe6f2 100644 (file)
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1497,33 +1497,6 @@ ZEND_API int ZEND_FASTCALL shift_right_function(zval *result, zval *op1, zval *o
 }
 /* }}} */
 
-/* must support result==op1 */
-ZEND_API int ZEND_FASTCALL add_char_to_string(zval *result, const zval *op1, const zval *op2) /* {{{ */
-{
-       size_t length = Z_STRLEN_P(op1) + 1;
-       zend_string *buf = zend_string_extend(Z_STR_P(op1), length, 0);
-
-       buf->val[length - 1] = (char) Z_LVAL_P(op2);
-       buf->val[length] = 0;
-       ZVAL_NEW_STR(result, buf);
-       return SUCCESS;
-}
-/* }}} */
-
-/* must support result==op1 */
-ZEND_API int ZEND_FASTCALL add_string_to_string(zval *result, const zval *op1, const zval *op2) /* {{{ */
-{
-       size_t op1_len = Z_STRLEN_P(op1);
-       size_t length = op1_len + Z_STRLEN_P(op2);
-       zend_string *buf = zend_string_extend(Z_STR_P(op1), length, 0);
-
-       memcpy(buf->val + op1_len, Z_STRVAL_P(op2), Z_STRLEN_P(op2));
-       buf->val[length] = 0;
-       ZVAL_NEW_STR(result, buf);
-       return SUCCESS;
-}
-/* }}} */
-
 ZEND_API int ZEND_FASTCALL concat_function(zval *result, zval *op1, zval *op2) /* {{{ */
 {
        zval op1_copy, op2_copy;

diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index e2e9abfaae8d841cb6393920c6236eadb788eeda..962b453bc2b32b96bd2f802f96461bb609d36d37 100644 (file)
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -267,8 +267,6 @@ static zend_always_inline zend_string *_zval_get_string(zval *op) {
 #define zval_get_double(op) _zval_get_double((op))
 #define zval_get_string(op) _zval_get_string((op))
 
-ZEND_API int ZEND_FASTCALL add_char_to_string(zval *result, const zval *op1, const zval *op2);
-ZEND_API int ZEND_FASTCALL add_string_to_string(zval *result, const zval *op1, const zval *op2);
 #define convert_to_cstring(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_cstring((op) ZEND_FILE_LINE_CC); }
 #define convert_to_string(op) if (Z_TYPE_P(op) != IS_STRING) { _convert_to_string((op) ZEND_FILE_LINE_CC); }
 

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 966d6d04ca37d4a88453ce91153c054d29460e5c..993a2fa4fc615b1a0a0aa153da1a35edf0cc7bb8 100644 (file)
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -1272,7 +1272,7 @@ static void model_to_zval_any(zval *ret, xmlNodePtr node)
                                        if (Z_TYPE(val2) != IS_STRING ||  *Z_STRVAL(val) != '<') {
                                                break;
                                        }
-                                       add_string_to_string(&val, &val, &val2);
+                                       concat_function(&val, &val, &val2);
                                        zval_ptr_dtor(&val2);
                                        node = node->next;
                                }