clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed unused functions

Browse Source
This commit is contained in:
Dmitry Stogov 2015-03-24 23:40:20 +03:00
parent e37e9d2986
commit 0ce7b4c8c6
3 changed files with 1 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Zend/zend_operators.c
View File

@ -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;

2
Zend/zend_operators.h
View File

@ -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); }

2
ext/soap/php_encoding.c
View File

@ -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;
}