svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c
| From: | Xinchen Hui | Date: | Fri, 07 Oct 2011 04:14:31 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/Zend/zend_compile.c trunk/Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-66704@lists.php.net to get a copy of this message | ||
laruence Fri, 07 Oct 2011 04:14:31 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=317849
Log:
Remove unecessary codes
Changed paths:
U php/php-src/branches/PHP_5_4/Zend/zend_compile.c
U php/php-src/trunk/Zend/zend_compile.c
Modified: php/php-src/branches/PHP_5_4/Zend/zend_compile.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-10-07 04:07:02 UTC (rev 317848)
+++ php/php-src/branches/PHP_5_4/Zend/zend_compile.c 2011-10-07 04:14:31 UTC (rev 317849)
@@ -3134,17 +3134,9 @@
*(offset++) = '\'';
} else {
zend_make_printable_zval(zv, &zv_copy, &use_copy);
- if (Z_TYPE_P(zv) == IS_STRING) {
- REALLOC_BUF_IF_EXCEED(buf, offset, length, MIN(Z_STRLEN_P(zv), Z_STRLEN_P(zv)));
- memcpy(offset, Z_STRVAL_P(zv), Z_STRLEN_P(zv));
- offset += Z_STRLEN_P(zv);
- } else if (Z_TYPE_P(zv) == IS_LONG) {
- REALLOC_BUF_IF_EXCEED(buf, offset, length, 21);
- offset += zend_sprintf(offset, "%ld", Z_LVAL_P(zv));
- } else if (Z_TYPE_P(zv) == IS_DOUBLE) {
- REALLOC_BUF_IF_EXCEED(buf, offset, length, 21);
- offset += zend_sprintf(offset, "%.*G", (int) EG(precision), Z_DVAL_P(zv));
- }
+ REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN(zv_copy));
+ memcpy(offset, Z_STRVAL(zv_copy), Z_STRLEN(zv_copy));
+ offset += Z_STRLEN(zv_copy);
if (use_copy) {
zval_dtor(&zv_copy);
}
Modified: php/php-src/trunk/Zend/zend_compile.c
===================================================================
--- php/php-src/trunk/Zend/zend_compile.c 2011-10-07 04:07:02 UTC (rev 317848)
+++ php/php-src/trunk/Zend/zend_compile.c 2011-10-07 04:14:31 UTC (rev 317849)
@@ -3134,17 +3134,9 @@
*(offset++) = '\'';
} else {
zend_make_printable_zval(zv, &zv_copy, &use_copy);
- if (Z_TYPE_P(zv) == IS_STRING) {
- REALLOC_BUF_IF_EXCEED(buf, offset, length, MIN(Z_STRLEN_P(zv), Z_STRLEN_P(zv)));
- memcpy(offset, Z_STRVAL_P(zv), Z_STRLEN_P(zv));
- offset += Z_STRLEN_P(zv);
- } else if (Z_TYPE_P(zv) == IS_LONG) {
- REALLOC_BUF_IF_EXCEED(buf, offset, length, 21);
- offset += zend_sprintf(offset, "%ld", Z_LVAL_P(zv));
- } else if (Z_TYPE_P(zv) == IS_DOUBLE) {
- REALLOC_BUF_IF_EXCEED(buf, offset, length, 21);
- offset += zend_sprintf(offset, "%.*G", (int) EG(precision), Z_DVAL_P(zv));
- }
+ REALLOC_BUF_IF_EXCEED(buf, offset, length, Z_STRLEN(zv_copy));
+ memcpy(offset, Z_STRVAL(zv_copy), Z_STRLEN(zv_copy));
+ offset += Z_STRLEN(zv_copy);
if (use_copy) {
zval_dtor(&zv_copy);
}