diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-06-03 14:49:29 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-06-03 14:49:29 +0300 |
| commit | b21191ba78f6a35d4958ffe549e74940c84c2cfe (patch) | |
| tree | f588f62b971abc4bc7839f0584fb6dc5fc3153eb | |
| parent | 6bcf121f5b990cbaee6324fb729b52e17a7bd7f2 (diff) | |
| download | php-git-b21191ba78f6a35d4958ffe549e74940c84c2cfe.tar.gz | |
Removed commented code
| -rw-r--r-- | Zend/zend_vm_def.h | 1 | ||||
| -rw-r--r-- | Zend/zend_vm_execute.h | 9 |
2 files changed, 0 insertions, 10 deletions
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 31e4047301..8f46c79065 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -280,7 +280,6 @@ ZEND_VM_HANDLER(8, ZEND_CONCAT, CONST|TMPVAR|CV, CONST|TMPVAR|CV) size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index bb2f7815f5..8dd1e9cd61 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -4691,7 +4691,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_CONST_HANDLE size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -8640,7 +8639,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_CV_HANDLER(Z size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -10474,7 +10472,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CONST_TMPVAR_HANDL size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -30538,7 +30535,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_CONST_HANDLER(Z size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -35857,7 +35853,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_CV_HANDLER(ZEND size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -38633,7 +38628,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_CV_TMPVAR_HANDLER( size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -41743,7 +41737,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_CONST_HANDL size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -44109,7 +44102,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_CV_HANDLER( size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; @@ -45236,7 +45228,6 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_CONCAT_SPEC_TMPVAR_TMPVAR_HAND size_t len = op1_str->len; str = zend_string_realloc(op1_str, len + op2_str->len, 0); -// memcpy(str->val, op1_str->val, op1_str->len); memcpy(str->val + len, op2_str->val, op2_str->len+1); ZVAL_NEW_STR(EX_VAR(opline->result.var), str); break; |