diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-09 16:05:55 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-09 16:05:55 +0400 |
| commit | 9d6e45a0ee84030f125ec6d49da07796977a2a29 (patch) | |
| tree | ea6193c52c6544f90991fc5f87f2a83507c4a5ce /Zend/zend_API.c | |
| parent | d085f79aea4ff900592c0eada5d44bf97744efe4 (diff) | |
| download | php-git-9d6e45a0ee84030f125ec6d49da07796977a2a29.tar.gz | |
Changed zend_make_printable_zval() to return "use_copy" instead of additional reference argument.
Improved branch prediction.
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index be0e052028..0edff3e1a7 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -243,15 +243,13 @@ static int parse_arg_object_to_string(zval *arg, char **p, int *pl, int type TSR } } if (!Z_OBJ_HANDLER_P(arg, cast_object) && Z_OBJ_HANDLER_P(arg, get)) { - int use_copy; zval rv; zval *z = Z_OBJ_HANDLER_P(arg, get)(arg, &rv TSRMLS_CC); Z_ADDREF_P(z); if(Z_TYPE_P(z) != IS_OBJECT) { zval_dtor(arg); ZVAL_NULL(arg); - zend_make_printable_zval(z, arg, &use_copy); - if (!use_copy) { + if (!zend_make_printable_zval(z, arg)) { ZVAL_ZVAL(arg, z, 1, 1); } *pl = Z_STRLEN_P(arg); @@ -284,15 +282,13 @@ static int parse_arg_object_to_str(zval *arg, zend_string **str, int type TSRMLS } } if (!Z_OBJ_HANDLER_P(arg, cast_object) && Z_OBJ_HANDLER_P(arg, get)) { - int use_copy; zval rv; zval *z = Z_OBJ_HANDLER_P(arg, get)(arg, &rv TSRMLS_CC); Z_ADDREF_P(z); if(Z_TYPE_P(z) != IS_OBJECT) { zval_dtor(arg); ZVAL_NULL(arg); - zend_make_printable_zval(z, arg, &use_copy); - if (!use_copy) { + if (!zend_make_printable_zval(z, arg)) { ZVAL_ZVAL(arg, z, 1, 1); } *str = Z_STR_P(arg); |