diff options
| author | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2014-04-21 14:14:00 +0800 |
| commit | e48b9ad197b4ec6ac72e75538453cc350d0a41f4 (patch) | |
| tree | f5ded37abc65e64e270b6f1ac264db9bc603f949 /ext/dom/dom_iterators.c | |
| parent | cf7e703813e065fec7a8a5caa7aff4b70d3455b8 (diff) | |
| parent | 54d9ad53f4797733b41bf2c65bd2c2cb5a1938b6 (diff) | |
| download | php-git-e48b9ad197b4ec6ac72e75538453cc350d0a41f4.tar.gz | |
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
Diffstat (limited to 'ext/dom/dom_iterators.c')
| -rw-r--r-- | ext/dom/dom_iterators.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ext/dom/dom_iterators.c b/ext/dom/dom_iterators.c index 250e2efab5..22d0ab0ee3 100644 --- a/ext/dom/dom_iterators.c +++ b/ext/dom/dom_iterators.c @@ -197,10 +197,7 @@ static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) if (objmap->nodetype != XML_ENTITY_NODE && objmap->nodetype != XML_NOTATION_NODE) { if (objmap->nodetype == DOM_NODESET) { - zval obj; - ZVAL_OBJ(&obj, &objmap->baseobj->std); - nodeht = HASH_OF(&obj); - + nodeht = HASH_OF(&objmap->baseobj_zv); zend_hash_move_forward(nodeht); if ((entry = zend_hash_get_current_data(nodeht))) { ZVAL_COPY(&iterator->curobj, entry); @@ -275,10 +272,7 @@ zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, i if (objmap->nodetype != XML_ENTITY_NODE && objmap->nodetype != XML_NOTATION_NODE) { if (objmap->nodetype == DOM_NODESET) { - zval obj; - ZVAL_OBJ(&obj, &objmap->baseobj->std); - nodeht = HASH_OF(&obj); - + nodeht = HASH_OF(&objmap->baseobj_zv); zend_hash_internal_pointer_reset(nodeht); if ((entry = zend_hash_get_current_data(nodeht))) { ZVAL_COPY(&iterator->curobj, entry); |