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/spl/spl_array.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/spl/spl_array.c')
| -rw-r--r-- | ext/spl/spl_array.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index ec28e2e4fd..e272a145e5 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -717,7 +717,7 @@ void spl_array_iterator_append(zval *object, zval *append_value TSRMLS_DC) /* {{ } if (Z_TYPE(intern->array) == IS_OBJECT) { - php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Cannot append properties to objects, use %s::offsetSet() instead", Z_OBJCE_P(object)->name); + php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Cannot append properties to objects, use %s::offsetSet() instead", Z_OBJCE_P(object)->name->val); return; } @@ -759,11 +759,11 @@ SPL_METHOD(Array, offsetUnset) Return a copy of the contained array */ SPL_METHOD(Array, getArrayCopy) { - zval *object = getThis(), *tmp; + zval *object = getThis(); spl_array_object *intern = (spl_array_object*)Z_OBJ_P(object); array_init(return_value); - zend_hash_copy(HASH_OF(return_value), spl_array_get_hash_table(intern, 0 TSRMLS_CC), (copy_ctor_func_t) zval_add_ref); + zend_hash_copy(Z_ARRVAL_P(return_value), spl_array_get_hash_table(intern, 0 TSRMLS_CC), (copy_ctor_func_t) zval_add_ref); } /* }}} */ static HashTable *spl_array_get_properties(zval *object TSRMLS_DC) /* {{{ */ @@ -1683,10 +1683,8 @@ SPL_METHOD(Array, serialize) /* done */ PHP_VAR_SERIALIZE_DESTROY(var_hash); - if (buf.c) { - RETVAL_STRINGL(buf.c, buf.len); - smart_str_free(&buf); - return; + if (buf.s) { + RETVAL_STR(buf.s); } zval_ptr_dtor(&members); |