diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:28:26 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-02-18 16:28:26 +0400 |
| commit | 9ddf3c57805f0bb76a26cb31ba33e64c04d2133c (patch) | |
| tree | 15b04b41c0ebbbc4d94ae96e1929410f657817e1 /ext/standard/var.c | |
| parent | 5de7115679522dec2f4725104c6f8c6e4a7bd8e4 (diff) | |
| parent | 43b03c74b322d6ceb003a14a7561fdffc4e13072 (diff) | |
| download | php-git-9ddf3c57805f0bb76a26cb31ba33e64c04d2133c.tar.gz | |
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
Diffstat (limited to 'ext/standard/var.c')
| -rw-r--r-- | ext/standard/var.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ext/standard/var.c b/ext/standard/var.c index 6ae7d24c2e..1e2b85c055 100644 --- a/ext/standard/var.c +++ b/ext/standard/var.c @@ -507,8 +507,8 @@ PHPAPI void php_var_export(zval *struc, int level TSRMLS_DC) /* {{{ */ { smart_str buf = {0}; php_var_export_ex(struc, level, &buf TSRMLS_CC); - smart_str_0 (&buf); - PHPWRITE(buf.c, buf.len); + smart_str_0(&buf); + PHPWRITE(buf.s->val, buf.s->len); smart_str_free(&buf); } /* }}} */ @@ -530,11 +530,11 @@ PHP_FUNCTION(var_export) smart_str_0 (&buf); if (return_output) { - RETVAL_STRINGL(buf.c, buf.len); + RETURN_STR(buf.s); } else { - PHPWRITE(buf.c, buf.len); + PHPWRITE(buf.s->val, buf.s->len); + smart_str_free(&buf); } - smart_str_free(&buf); } /* }}} */ @@ -924,9 +924,8 @@ PHP_FUNCTION(serialize) RETURN_FALSE; } - if (buf.c) { -//??? RETURN_STRINGL(buf.c, buf.len, 0); - RETURN_STRINGL(buf.c, buf.len); + if (buf.s) { + RETURN_STR(buf.s); } else { RETURN_NULL(); } |