[PHP-CVS] cvs: php-src /ext/simplexml simplexml.c

[Marcus Boerger]

helly           Sat Oct 29 20:20:38 2005 EDT

  Modified files:              
    /php-src/ext/simplexml      simplexml.c 
  Log:
  - Simplify & speedup
  
http://cvs.php.net/diff.php/php-src/ext/simplexml/simplexml.c?r1=1.166&r2=1.167&ty=u
Index: php-src/ext/simplexml/simplexml.c
diff -u php-src/ext/simplexml/simplexml.c:1.166 
php-src/ext/simplexml/simplexml.c:1.167
--- php-src/ext/simplexml/simplexml.c:1.166     Sat Oct 29 17:16:17 2005
+++ php-src/ext/simplexml/simplexml.c   Sat Oct 29 20:20:35 2005
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: simplexml.c,v 1.166 2005/10/29 21:16:17 helly Exp $ */
+/* $Id: simplexml.c,v 1.167 2005/10/30 00:20:35 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1569,6 +1569,7 @@
 {
        xmlNodePtr node;
        char *prefix;
+       int test;
 
        if (sxe->iter.data) {
                zval_ptr_dtor(&sxe->iter.data);
@@ -1590,6 +1591,7 @@
        }
 
        prefix = sxe->iter.nsprefix;
+       test = sxe->iter.type == SXE_ITER_ATTRLIST && sxe->iter.name;
 
        while (node) {
                SKIP_TEXT(node);
@@ -1605,11 +1607,7 @@
                        }
                } else {
                        if (node->type == XML_ATTRIBUTE_NODE) {
-                               if (sxe->iter.type == SXE_ITER_ATTRLIST && 
sxe->iter.name) {
-                                       if (!xmlStrcmp(node->name, 
sxe->iter.name) && match_ns(sxe, node, prefix)) {
-                                               break;
-                                       }
-                               } else if (match_ns(sxe, node, 
sxe->iter.nsprefix)) {
+                               if ((!test || !xmlStrcmp(node->name, 
sxe->iter.name)) && match_ns(sxe, node, prefix)) {
                                        break;
                                }
                        }
@@ -1698,6 +1696,7 @@
        xmlNodePtr      node = NULL;
        php_sxe_object  *intern;
        char *prefix;
+       int test;
 
        if (sxe->iter.data) {
                intern = (php_sxe_object 
*)zend_object_store_get_object(sxe->iter.data TSRMLS_CC);
@@ -1711,6 +1710,7 @@
        }
 
        prefix = sxe->iter.nsprefix;
+       test = sxe->iter.type == SXE_ITER_ATTRLIST && sxe->iter.name;
 
        while (node) {
                SKIP_TEXT(node);
@@ -1727,11 +1727,7 @@
                        }
                } else {
                        if (node->type == XML_ATTRIBUTE_NODE) {
-                               if (sxe->iter.type == SXE_ITER_ATTRLIST && 
sxe->iter.name) {
-                                       if (!xmlStrcmp(node->name, 
sxe->iter.name) && match_ns(sxe, node, prefix)) {
-                                               break;
-                                       }
-                               } else if (match_ns(sxe, node, 
sxe->iter.nsprefix)) {
+                               if ((!test || !xmlStrcmp(node->name, 
sxe->iter.name)) && match_ns(sxe, node, prefix)) {
                                        break;
                                }
                        }
@@ -1921,7 +1917,7 @@
 {
        php_info_print_table_start();
        php_info_print_table_header(2, "Simplexml support", "enabled");
-       php_info_print_table_row(2, "Revision", "$Revision: 1.166 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.167 $");
        php_info_print_table_row(2, "Schema support",
 #ifdef LIBXML_SCHEMAS_ENABLED
                "enabled");

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php