diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2011-08-08 13:45:18 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2011-08-08 13:45:18 +0000 |
| commit | bfdd53cd045ceff446f63ca0b97102a1a299d1ba (patch) | |
| tree | 4c2a92b795fe2f0d584a957fdd5bacd3e7649064 /ext/dom/xml_common.h | |
| parent | 0c1516f1741fcab7dd543d1469df6ff35d72d734 (diff) | |
| download | php-git-bfdd53cd045ceff446f63ca0b97102a1a299d1ba.tar.gz | |
Removal of deadcode identified by coverity
Diffstat (limited to 'ext/dom/xml_common.h')
| -rw-r--r-- | ext/dom/xml_common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h index 075d9ffb97..1f47eb6e39 100644 --- a/ext/dom/xml_common.h +++ b/ext/dom/xml_common.h @@ -54,7 +54,7 @@ typedef struct _dom_object { PHP_DOM_EXPORT extern zend_class_entry *dom_node_class_entry; PHP_DOM_EXPORT dom_object *php_dom_object_get_data(xmlNodePtr obj); -PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *in, zval* return_value, dom_object *domobj TSRMLS_DC); +PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval* return_value, dom_object *domobj TSRMLS_DC); PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); #define DOM_XMLNS_NAMESPACE \ @@ -78,8 +78,8 @@ PHP_DOM_EXPORT xmlNodePtr dom_object_get_node(dom_object *obj); } \ } -#define DOM_RET_OBJ(zval, obj, ret, domobject) \ - if (NULL == (zval = php_dom_create_object(obj, ret, zval, return_value, domobject TSRMLS_CC))) { \ +#define DOM_RET_OBJ(obj, ret, domobject) \ + if (!php_dom_create_object(obj, ret, return_value, domobject TSRMLS_CC)) { \ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cannot create required DOM object"); \ RETURN_FALSE; \ } |