Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  - Value stored to var is never read
This commit is contained in:
Felipe Pena 2012-08-19 12:13:59 -03:00
commit 6513ca85c2

View file

@ -832,7 +832,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
} }
if (errorcode == 0 && is_xmlns == 0) { if (errorcode == 0 && is_xmlns == 0) {
attr = xmlSetNsProp(elemp, nsptr, (xmlChar *)localname, (xmlChar *)value); xmlSetNsProp(elemp, nsptr, (xmlChar *)localname, (xmlChar *)value);
} }
} else { } else {
name_valid = xmlValidateName((xmlChar *) localname, 0); name_valid = xmlValidateName((xmlChar *) localname, 0);
@ -844,7 +844,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
if (attr != NULL && attr->type != XML_ATTRIBUTE_DECL) { if (attr != NULL && attr->type != XML_ATTRIBUTE_DECL) {
node_list_unlink(attr->children TSRMLS_CC); node_list_unlink(attr->children TSRMLS_CC);
} }
attr = xmlSetProp(elemp, (xmlChar *)localname, (xmlChar *)value); xmlSetProp(elemp, (xmlChar *)localname, (xmlChar *)value);
} }
} }
} }