diff options
| author | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
|---|---|---|
| committer | SVN Migration <svn@php.net> | 2008-12-03 20:30:45 +0000 |
| commit | 2876046398950e59c3b3c460e67e6fec7ff2ba3c (patch) | |
| tree | 33b2b8b4b859960a6446ad19d0ada1c55f9cfcda /ext/dom/php_dom.c | |
| parent | 3fb86b0b9e79e6a3312b694f30ee627e2e1b325c (diff) | |
| download | php-git-php-5.3.0alpha2.tar.gz | |
This commit was manufactured by cvs2svn to create tag 'php_5_3_0alpha2'.php-5.3.0alpha2
Diffstat (limited to 'ext/dom/php_dom.c')
| -rw-r--r-- | ext/dom/php_dom.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 3e9ebdd0f8..38c8dfacab 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -188,7 +188,7 @@ int dom_set_doc_classmap(php_libxml_ref_obj *document, zend_class_entry *basece, if (ce) { return zend_hash_update(doc_props->classmap, basece->name, basece->name_length + 1, &ce, sizeof(ce), NULL); } else { - zend_hash_del(doc_props->classmap, basece->name, basece->name_length + 1); + return zend_hash_del(doc_props->classmap, basece->name, basece->name_length + 1); } } return SUCCESS; @@ -510,6 +510,7 @@ zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC) /* {{{ */ /* }}} */ /* {{{ arginfo */ +static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_import_simplexml, 0, 0, 1) ZEND_ARG_INFO(0, node) ZEND_END_ARG_INFO() @@ -964,10 +965,8 @@ void dom_xpath_objects_free_storage(void *object TSRMLS_DC) intern->ptr = NULL; } - if (intern->registered_phpfunctions) { - zend_hash_destroy(intern->registered_phpfunctions); - FREE_HASHTABLE(intern->registered_phpfunctions); - } + zend_hash_destroy(intern->registered_phpfunctions); + FREE_HASHTABLE(intern->registered_phpfunctions); if (intern->node_list) { zend_hash_destroy(intern->node_list); |