com php-src: Drop SXE_ELEMENT_BY_NAME: ext/simplexml/ simplexml.c
| From: | Nikita Popov | Date: | Sun, 04 Sep 2016 10:31:06 +0000 |
| Subject: | com php-src: Drop SXE_ELEMENT_BY_NAME: ext/simplexml/ simplexml.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94290@lists.php.net to get a copy of this message | ||
Commit: bbe0cca221d43499063f332c9377c435747fb807
Author: Nikita Popov <nikic@php.net> Sun, 4 Sep 2016 12:29:46 +0200
Parents: f1fc531e74170a5a8aa8bacb3b6d4bea11b50b31
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bbe0cca221d43499063f332c9377c435747fb807
Log:
Drop SXE_ELEMENT_BY_NAME
Effectively commented out code
Changed paths:
M ext/simplexml/simplexml.c
Diff:
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index fdda304..fdd0988 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -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
}
}
}