]> granicus.if.org Git - php/commitdiff
Drop SXE_ELEMENT_BY_NAME
authorNikita Popov <nikic@php.net>
Sun, 4 Sep 2016 10:29:46 +0000 (12:29 +0200)
committerNikita Popov <nikic@php.net>
Sun, 4 Sep 2016 10:31:06 +0000 (12:31 +0200)
Effectively commented out code

ext/simplexml/simplexml.c

index fdda30451d6229bd77fb015f3e06bb775d2d155e..fdd09881eb1cab731418b3ca69ca2ecdb700024f 100644 (file)
@@ -36,8 +36,6 @@
 #include "zend_interfaces.h"
 #include "sxe.h"
 
-#define SXE_ELEMENT_BY_NAME 0
-
 zend_class_entry *sxe_class_entry = NULL;
 
 PHP_SXE_API zend_class_entry *sxe_get_element_class_entry() /* {{{ */
@@ -347,20 +345,10 @@ long_dim:
                                        _node_as_zval(sxe, node, rv, SXE_ITER_NONE, NULL, sxe->iter.nsprefix, sxe->iter.isprefix);
                                }
                        } else {
-#if SXE_ELEMENT_BY_NAME
-                               int newtype;
-
-                               GET_NODE(sxe, node);
-                               node = sxe_get_element_by_name(sxe, node, &name, &newtype);
-                               if (node) {
-                                       _node_as_zval(sxe, node, rv, newtype, name, sxe->iter.nsprefix, sxe->iter.isprefix);
-                               }
-#else
                                /* In BP_VAR_IS mode only return a proper node if it actually exists. */
                                if (type != BP_VAR_IS || sxe_find_element_by_name(sxe, node->children, (xmlChar *) name)) {
                                        _node_as_zval(sxe, node, rv, SXE_ITER_ELEMENT, name, sxe->iter.nsprefix, sxe->iter.isprefix);
                                }
-#endif
                        }
                }
        }