Skip to content

Commit 75229cb

Browse files
committed
Cleanup php_libxml_node_decrement_resource()
obj_node is already checked, so checking it again in the second if is not necessary. Merge declarations and assignments while we're at it.
1 parent 6d3433e commit 75229cb

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

ext/libxml/libxml.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,18 +1344,14 @@ PHP_LIBXML_API void php_libxml_node_free_resource(xmlNodePtr node)
13441344

13451345
PHP_LIBXML_API void php_libxml_node_decrement_resource(php_libxml_node_object *object)
13461346
{
1347-
int ret_refcount = -1;
1348-
xmlNodePtr nodep;
1349-
php_libxml_node_ptr *obj_node;
1350-
13511347
if (object != NULL && object->node != NULL) {
1352-
obj_node = (php_libxml_node_ptr *) object->node;
1353-
nodep = object->node->node;
1354-
ret_refcount = php_libxml_decrement_node_ptr(object);
1348+
php_libxml_node_ptr *obj_node = (php_libxml_node_ptr *) object->node;
1349+
xmlNodePtr nodep = obj_node->node;
1350+
int ret_refcount = php_libxml_decrement_node_ptr(object);
13551351
if (ret_refcount == 0) {
13561352
php_libxml_node_free_resource(nodep);
13571353
} else {
1358-
if (obj_node && object == obj_node->_private) {
1354+
if (object == obj_node->_private) {
13591355
obj_node->_private = NULL;
13601356
}
13611357
}

0 commit comments

Comments
 (0)