remove code no longer needed

fix format Output property

diff --git a/ext/dom/document.c b/ext/dom/document.c
index 18d444cac37577203d287e2140171286bf9b5a3a..1709618e7e1221ebf94d1eeacf241aad1b1e0c67 100644 (file)
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -428,7 +428,6 @@ PHP_FUNCTION(dom_document_create_element)
                RETURN_FALSE;
        }
 
-       dom_add_to_list(node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, node, &ret, intern);
 }
 /* }}} end dom_document_create_element */
@@ -453,7 +452,6 @@ PHP_FUNCTION(dom_document_create_document_fragment)
                RETURN_FALSE;
        }
 
-       dom_add_to_list(node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, node, &ret, intern);
 }
 /* }}} end dom_document_create_document_fragment */
@@ -483,7 +481,6 @@ PHP_FUNCTION(dom_document_create_text_node)
                RETURN_FALSE;
        }
 
-       dom_add_to_list(node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, node, &ret, intern);
 }
 /* }}} end dom_document_create_text_node */
@@ -513,7 +510,6 @@ PHP_FUNCTION(dom_document_create_comment)
                RETURN_FALSE;
        }
 
-       dom_add_to_list(node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, node, &ret, intern);
 }
 /* }}} end dom_document_create_comment */
@@ -543,7 +539,6 @@ PHP_FUNCTION(dom_document_create_cdatasection)
                RETURN_FALSE;
        }
 
-       dom_add_to_list(node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, node, &ret, intern);
 }
 /* }}} end dom_document_create_cdatasection */
@@ -575,7 +570,6 @@ PHP_FUNCTION(dom_document_create_processing_instruction)
 
        node->doc = docp;
 
-       dom_add_to_list(node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, node, &ret, intern);
 }
 /* }}} end dom_document_create_processing_instruction */
@@ -610,7 +604,6 @@ PHP_FUNCTION(dom_document_create_attribute)
                RETURN_FALSE;
        }
 
-       dom_add_to_list((xmlNodePtr) node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, (xmlNodePtr) node, &ret, intern);
 
 }
@@ -641,7 +634,6 @@ PHP_FUNCTION(dom_document_create_entity_reference)
                RETURN_FALSE;
        }
 
-       dom_add_to_list((xmlNodePtr) node, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, (xmlNodePtr) node, &ret, intern);
 }
 /* }}} end dom_document_create_entity_reference */
@@ -745,7 +737,6 @@ PHP_FUNCTION(dom_document_import_node)
                if (!retnodep) {
                        RETURN_FALSE;
                }
-               dom_add_to_list((xmlNodePtr) retnodep, intern TSRMLS_CC);
        }
 
        DOM_RET_OBJ(rv, (xmlNodePtr) retnodep, &ret, intern);
@@ -798,7 +789,6 @@ PHP_FUNCTION(dom_document_create_element_ns)
                RETURN_FALSE;
        }
 
-       dom_add_to_list(nodep, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, nodep, &ret, intern);
 }
 /* }}} end dom_document_create_element_ns */
@@ -852,7 +842,6 @@ PHP_FUNCTION(dom_document_create_attribute_ns)
                RETURN_FALSE;
        }
 
-       dom_add_to_list(nodep, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, nodep, &ret, intern);
 }
 /* }}} end dom_document_create_attribute_ns */
@@ -997,6 +986,8 @@ PHP_FUNCTION(dom_document_document)
                php_dom_set_object(intern, docp TSRMLS_CC);
        }
 
+       add_property_bool(id, "formatOutput", 0);
+
 }
 /* }}} end dom_document_document */
 

diff --git a/ext/dom/element.c b/ext/dom/element.c
index 347994b6330f4f194f1c62e159dce3be8ad26d94..37086d4cd02a314af2b9e56b52f63f09a4a5ed37 100644 (file)
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -229,7 +229,6 @@ PHP_FUNCTION(dom_element_remove_attribute)
                xmlUnlinkNode((xmlNodePtr) attrp);
                xmlFreeProp(attrp);
        } else {
-               dom_add_to_list((xmlNodePtr) attrp, intern TSRMLS_CC);
                xmlUnlinkNode((xmlNodePtr) attrp);
        }
 
@@ -295,13 +294,11 @@ PHP_FUNCTION(dom_element_set_attribute_node)
        existattrp = xmlHasProp(nodep, attrp->name);
        if (existattrp != NULL) {
                if ((oldobj = dom_object_get_data((xmlNodePtr) existattrp)) == NULL) {
-                       dom_add_to_list((xmlNodePtr) existattrp, intern TSRMLS_CC);
                        xmlUnlinkNode((xmlNodePtr) existattrp);
                } else {
                        if (oldobj->ptr == attrp) {
                                RETURN_NULL();
                        }
-                       dom_add_to_list((xmlNodePtr) existattrp, intern TSRMLS_CC);
                        xmlUnlinkNode((xmlNodePtr) existattrp);
                }
        }
@@ -312,7 +309,6 @@ PHP_FUNCTION(dom_element_set_attribute_node)
        }
 
        xmlAddChild(nodep, (xmlNodePtr) attrp);
-       dom_del_from_list((xmlNodePtr) attrp, intern TSRMLS_CC);
 
        /* Returns old property if removed otherwise NULL */
        if (existattrp != NULL) {
@@ -356,7 +352,6 @@ PHP_FUNCTION(dom_element_remove_attribute_node)
                xmlUnlinkNode((xmlNodePtr) attrp);
                xmlFreeProp(attrp);
        } else {
-               dom_add_to_list((xmlNodePtr) attrp, intern TSRMLS_CC);
                xmlUnlinkNode((xmlNodePtr) attrp);
        }
 
@@ -555,7 +550,6 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
                        xmlUnlinkNode((xmlNodePtr) attrp);
                        xmlFreeProp(attrp);
                } else {
-                       dom_add_to_list((xmlNodePtr) attrp, intern TSRMLS_CC);
                        xmlUnlinkNode((xmlNodePtr) attrp);
                }
        }
@@ -641,13 +635,11 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns)
 
        if (existattrp != NULL) {
                if ((oldobj = dom_object_get_data((xmlNodePtr) existattrp)) == NULL) {
-                       dom_add_to_list((xmlNodePtr) existattrp, intern TSRMLS_CC);
                        xmlUnlinkNode((xmlNodePtr) existattrp);
                } else {
                        if (oldobj->ptr == attrp) {
                                RETURN_NULL();
                        }
-                       dom_add_to_list((xmlNodePtr) existattrp, intern TSRMLS_CC);
                        xmlUnlinkNode((xmlNodePtr) existattrp);
                }
        }
@@ -662,8 +654,6 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns)
                xmlReconciliateNs(nodep->doc, nodep);
        }
 
-       dom_del_from_list((xmlNodePtr) attrp, intern TSRMLS_CC);
-
        /* Returns old property if removed otherwise NULL */
        if (existattrp != NULL) {
                DOM_RET_OBJ(rv, (xmlNodePtr) existattrp, &ret, intern);

diff --git a/ext/dom/node.c b/ext/dom/node.c
index 877b30c8e34323e856f7b0cc8f01e88f3449aeb3..d176dd684cfdc13bec58934b4d200d709ecc3e5f 100644 (file)
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@@ -819,7 +819,6 @@ PHP_FUNCTION(dom_node_insert_before)
                        if (new_child != NULL) {
                                child->children = NULL;
                        }
-                       dom_add_to_list(child, intern TSRMLS_CC);
                        DOM_RET_OBJ(rv, new_child, &ret, intern);
                        return;
                }
@@ -831,8 +830,6 @@ PHP_FUNCTION(dom_node_insert_before)
                RETURN_FALSE;
        }
 
-       dom_del_from_list(child, intern TSRMLS_CC);
-
        DOM_RET_OBJ(rv, new_child, &ret, intern);
 
 }
@@ -891,16 +888,11 @@ PHP_FUNCTION(dom_node_replace_child)
                zval *rv = NULL;
                if (oldchild != newchild) {
                        xmlNodePtr node;
-                       if (newchild->parent == NULL && newchild->doc != NULL) {
-                               dom_del_from_list(newchild, intern TSRMLS_CC);
-                       }
                        if (newchild->doc == NULL && nodep->doc != NULL) {
                                newchildobj->document = intern->document;
                                increment_document_reference(newchildobj, NULL TSRMLS_CC);
                        }
-                       if((node = xmlReplaceNode(oldchild, newchild)) != NULL) {
-                               dom_add_to_list(node, intern TSRMLS_CC);
-                       }
+                       node = xmlReplaceNode(oldchild, newchild);
                }
                DOM_RET_OBJ(rv, oldchild, &ret, intern);
                return;
@@ -942,7 +934,6 @@ PHP_FUNCTION(dom_node_remove_child)
                if (children == child) {
                        zval *rv = NULL;
                        xmlUnlinkNode(child);
-                       dom_add_to_list(child, intern TSRMLS_CC);
                        DOM_RET_OBJ(rv, child, &ret, intern);
                        return;
                }
@@ -1029,7 +1020,6 @@ PHP_FUNCTION(dom_node_append_child)
                if (new_child != NULL) {
                        child->children = NULL;
                }
-               dom_add_to_list(child, intern TSRMLS_CC);
                DOM_RET_OBJ(rv, new_child, &ret, intern);
                return;
        }
@@ -1037,12 +1027,10 @@ PHP_FUNCTION(dom_node_append_child)
        new_child = xmlAddChild(nodep, child);
 
        if (new_child == NULL) {
-               dom_add_to_list(child, intern TSRMLS_CC);
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Couldn't append node");
                RETURN_FALSE;
        }
 
-       dom_del_from_list(child, intern TSRMLS_CC);
        DOM_RET_OBJ(rv, new_child, &ret, intern);
 }
 /* }}} end dom_node_append_child */
@@ -1094,7 +1082,6 @@ PHP_FUNCTION(dom_node_clone_node)
        if (!node) {
                RETURN_FALSE;
        }
-       dom_add_to_list(node, intern TSRMLS_CC);
 
        DOM_RET_OBJ(rv, node, &ret, intern);
 }

diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
index 08d8f233a469948f3aef57842a12191a39d0d09e..e205e367280269030f0dd57d2fc430bd79c6e420 100644 (file)
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@@ -85,7 +85,6 @@ int increment_document_reference(dom_object *object, xmlDocPtr docp TSRMLS_DC) {
                object->document = emalloc(sizeof(dom_ref_obj));
                object->document->ptr = docp;
                object->document->refcount = 1;
-               object->document->node_list = NULL;
        }
 
        return ret_refcount;
@@ -101,9 +100,6 @@ int decrement_document_reference(dom_object *object TSRMLS_DC) {
                ret_refcount = object->document->refcount;
                if (ret_refcount == 0) {
                        if (object->document->ptr != NULL) {
-                               dom_clean_nodes(object TSRMLS_CC);
-                               /* No references to Doc so can use xmlFreeDoc
-                               node_free_resource(object->document->ptr TSRMLS_CC); */
                                xmlFreeDoc((xmlDoc *) object->document->ptr);
                                object->document->ptr = NULL;
                        }
@@ -158,67 +154,12 @@ void dom_unregister_node(xmlNodePtr nodep TSRMLS_DC)
 
        wrapper = dom_object_get_data(nodep);
        if (wrapper != NULL ) {
-               if (nodep->parent == NULL && nodep->doc != NULL && (xmlNodePtr) nodep->doc != nodep) {
-                       dom_del_from_list(nodep, wrapper TSRMLS_CC);
-               }
                dom_object_set_data(nodep, NULL TSRMLS_CC);
                php_dom_clear_object(wrapper TSRMLS_CC);
        }
 }
 /* }}} end dom_unregister_node */
 
-/* {{{ dom_del_from_list */
-void dom_del_from_list(xmlNodePtr nodep, dom_object *object TSRMLS_DC)
-{
-       xmlNodePtr cur;
-       node_list_pointer *cur_element, *prev;
-
-       if (object != NULL && nodep != NULL) {
-               if (object->document != NULL) {
-                       cur_element = object->document->node_list;
-                       prev = NULL;
-                       while (cur_element != NULL) {
-                               cur = cur_element->nodep;
-                               if (cur == nodep) {
-                                       if (prev == NULL) {
-                                               object->document->node_list = cur_element->next;
-                                       } else {
-                                               prev->next = cur_element->next;
-                                       }
-                                       efree(cur_element);
-                                       return;
-                               } else {
-                                       prev = cur_element;
-                                       cur_element = cur_element->next;
-                               }
-                       }
-               }
-       }
-}
-/* }}} */
-
-/* {{{ dom_add_to_list */
-void dom_add_to_list(xmlNodePtr nodep, dom_object *object TSRMLS_DC)
-{
-       node_list_pointer *cur_element;
-
-       if (object != NULL && nodep != NULL) {
-               if (nodep->parent == NULL) {
-                       if (object->document != NULL) {
-                               dom_del_from_list(nodep, object TSRMLS_CC);
-                               cur_element = emalloc(sizeof(node_list_pointer));
-                               cur_element->nodep = nodep;
-                               cur_element->next = NULL;
-                               if (object->document->node_list != NULL) {
-                                       cur_element->next = object->document->node_list;
-                               }
-                               object->document->node_list = cur_element;
-                       }
-               }
-       }
-}
-/* }}} */
-
 /* {{{ dom_read_na */
 static int dom_read_na(dom_object *obj, zval **retval TSRMLS_DC)
 {
@@ -636,21 +577,6 @@ PHP_MSHUTDOWN_FUNCTION(dom)
        return SUCCESS;
 }
 
-/* {{{ dom_clean_nodes */
-void dom_clean_nodes(dom_object *object TSRMLS_DC)
-{
-       node_list_pointer *l;
-
-       if (object != NULL && object->document != NULL) {
-               l = object->document->node_list;
-               while (l != NULL) {
-                       node_free_resource(l->nodep TSRMLS_CC);
-                       l = object->document->node_list;
-               }
-       }
-}
-/* }}} */
-
 /* {{{ node_list_unlink */
 void node_list_unlink(xmlNodePtr node TSRMLS_DC)
 {
@@ -661,7 +587,6 @@ void node_list_unlink(xmlNodePtr node TSRMLS_DC)
                wrapper = dom_object_get_data(node);
 
                if (wrapper != NULL ) {
-                       dom_add_to_list(node, wrapper TSRMLS_CC);
                        xmlUnlinkNode(node);
                } else {
                        node_list_unlink(node->children TSRMLS_CC);
@@ -823,8 +748,6 @@ void dom_objects_dtor(void *object, zend_object_handle handle TSRMLS_DC)
        zend_hash_destroy(intern->std.properties);
        FREE_HASHTABLE(intern->std.properties);
 
-
-
        if (intern->ptr) {
                if (((xmlNodePtr) intern->ptr)->type != XML_DOCUMENT_NODE && ((xmlNodePtr) intern->ptr)->type != XML_HTML_DOCUMENT_NODE) {
                        node_free_resource(intern->ptr TSRMLS_CC);
@@ -974,7 +897,6 @@ zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *wrapper_in, zval *
                        return wrapper;
        }
 
-
        object_init_ex(wrapper, ce);
        /* Add object properties not needing function calls */
        if (obj->type == XML_DOCUMENT_NODE || obj->type == XML_HTML_DOCUMENT_NODE) {

diff --git a/ext/dom/php_dom.h b/ext/dom/php_dom.h
index e1e942be3ae26b9a954d184920b02fbfbda75563..b99a15c5d0b8b796fc7a64999e9dbc1c0a8c1251 100644 (file)
--- a/ext/dom/php_dom.h
+++ b/ext/dom/php_dom.h
@@ -61,9 +61,6 @@ dom_object *dom_object_get_data(xmlNodePtr obj);
 void php_dom_throw_error(int error_code, zval **retval TSRMLS_DC);
 void node_free_resource(xmlNodePtr node TSRMLS_DC);
 void node_list_unlink(xmlNodePtr node TSRMLS_DC);
-void dom_del_from_list(xmlNodePtr nodep, dom_object *intern TSRMLS_DC);
-void dom_add_to_list(xmlNodePtr nodep, dom_object *intern TSRMLS_DC);
-void dom_clean_nodes(dom_object *object TSRMLS_DC);
 int increment_document_reference(dom_object *object, xmlDocPtr docp TSRMLS_DC);
 int decrement_document_reference(dom_object *object TSRMLS_DC);
 xmlNsPtr dom_get_ns(char *uri, char *qName, int uri_len, int qName_len, int *errorcode, char **localname);

diff --git a/ext/dom/text.c b/ext/dom/text.c
index 0f0b9ab1e20fc7b7f4443d06f40ed0a25a8a7d77..68461ccd5d5c675384cc419eace5668cbe469cf8 100644 (file)
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@@ -150,8 +150,6 @@ PHP_FUNCTION(dom_text_split_text)
                nnode->type = XML_ELEMENT_NODE;
                xmlAddNextSibling(node, nnode);
                nnode->type = XML_TEXT_NODE;
-       } else {
-               dom_add_to_list(nnode, intern TSRMLS_CC);
        }
        
        return_value = php_dom_create_object(nnode, &ret, NULL, return_value, intern TSRMLS_CC);

diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
index 1e3087e0ab16f8694fc5190bc5829cf4b41ef408..b114106ec64cbacfd2a9f4c0ef423e45ac6cf85f 100644 (file)
--- a/ext/dom/xml_common.h
+++ b/ext/dom/xml_common.h
@@ -20,28 +20,17 @@
 /* $Id$ */
 
 #ifndef PHP_XML_COMMON_H
-#define PHP_XML_COMMON_H 
-
-typedef struct _node_list_pointer {
-       xmlNodePtr nodep;
-       void *next;
-} node_list_pointer;
-
-typedef struct _doc_ref_obj {
-       void *ptr;
-       int   refcount;
-} doc_ref_obj;
+#define PHP_XML_COMMON_H
 
 typedef struct _dom_ref_obj {
        void *ptr;
        int   refcount;
-       node_list_pointer *node_list;
 } dom_ref_obj;
 
 typedef struct _node_object {
        zend_object  std;
        xmlNodePtr node;
-       doc_ref_obj *document;
+       dom_ref_obj *document;
 } node_object;
 
 typedef struct _dom_object {