rrichards Sun Jun 15 15:58:42 2003 EDT
Modified files:
/php4/ext/dom xml_common.h text.c php_dom.h php_dom.c node.c
element.c document.c
Log:
remove code no longer needed
fix format Output property
Index: php4/ext/dom/xml_common.h
diff -u php4/ext/dom/xml_common.h:1.7 php4/ext/dom/xml_common.h:1.8
--- php4/ext/dom/xml_common.h:1.7 Sat Jun 14 14:14:59 2003
+++ php4/ext/dom/xml_common.h Sun Jun 15 15:58:42 2003
@@ -17,31 +17,20 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml_common.h,v 1.7 2003/06/14 18:14:59 rrichards Exp $ */
+/* $Id: xml_common.h,v 1.8 2003/06/15 19:58:42 rrichards Exp $ */
#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 {
Index: php4/ext/dom/text.c
diff -u php4/ext/dom/text.c:1.9 php4/ext/dom/text.c:1.10
--- php4/ext/dom/text.c:1.9 Thu Jun 12 13:04:28 2003
+++ php4/ext/dom/text.c Sun Jun 15 15:58:42 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: text.c,v 1.9 2003/06/12 17:04:28 rrichards Exp $ */
+/* $Id: text.c,v 1.10 2003/06/15 19:58:42 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -150,8 +150,6 @@
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);
Index: php4/ext/dom/php_dom.h
diff -u php4/ext/dom/php_dom.h:1.4 php4/ext/dom/php_dom.h:1.5
--- php4/ext/dom/php_dom.h:1.4 Thu Jun 12 16:02:05 2003
+++ php4/ext/dom/php_dom.h Sun Jun 15 15:58:42 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.h,v 1.4 2003/06/12 20:02:05 rrichards Exp $ */
+/* $Id: php_dom.h,v 1.5 2003/06/15 19:58:42 rrichards Exp $ */
#ifndef PHP_DOM_H
#define PHP_DOM_H
@@ -61,9 +61,6 @@
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);
Index: php4/ext/dom/php_dom.c
diff -u php4/ext/dom/php_dom.c:1.12 php4/ext/dom/php_dom.c:1.13
--- php4/ext/dom/php_dom.c:1.12 Sat Jun 14 14:14:59 2003
+++ php4/ext/dom/php_dom.c Sun Jun 15 15:58:42 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.12 2003/06/14 18:14:59 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.13 2003/06/15 19:58:42 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -85,7 +85,6 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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);
@@ -973,7 +896,6 @@
ZVAL_NULL(wrapper);
return wrapper;
}
-
object_init_ex(wrapper, ce);
/* Add object properties not needing function calls */
Index: php4/ext/dom/node.c
diff -u php4/ext/dom/node.c:1.5 php4/ext/dom/node.c:1.6
--- php4/ext/dom/node.c:1.5 Thu Jun 12 16:02:05 2003
+++ php4/ext/dom/node.c Sun Jun 15 15:58:42 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: node.c,v 1.5 2003/06/12 20:02:05 rrichards Exp $ */
+/* $Id: node.c,v 1.6 2003/06/15 19:58:42 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -819,7 +819,6 @@
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 @@
RETURN_FALSE;
}
- dom_del_from_list(child, intern TSRMLS_CC);
-
DOM_RET_OBJ(rv, new_child, &ret, intern);
}
@@ -891,16 +888,11 @@
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 @@
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 @@
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 @@
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 @@
if (!node) {
RETURN_FALSE;
}
- dom_add_to_list(node, intern TSRMLS_CC);
DOM_RET_OBJ(rv, node, &ret, intern);
}
Index: php4/ext/dom/element.c
diff -u php4/ext/dom/element.c:1.4 php4/ext/dom/element.c:1.5
--- php4/ext/dom/element.c:1.4 Tue Jun 10 16:03:27 2003
+++ php4/ext/dom/element.c Sun Jun 15 15:58:42 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: element.c,v 1.4 2003/06/10 20:03:27 imajes Exp $ */
+/* $Id: element.c,v 1.5 2003/06/15 19:58:42 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -229,7 +229,6 @@
xmlUnlinkNode((xmlNodePtr) attrp);
xmlFreeProp(attrp);
} else {
- dom_add_to_list((xmlNodePtr) attrp, intern TSRMLS_CC);
xmlUnlinkNode((xmlNodePtr) attrp);
}
@@ -295,13 +294,11 @@
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 @@
}
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 @@
xmlUnlinkNode((xmlNodePtr) attrp);
xmlFreeProp(attrp);
} else {
- dom_add_to_list((xmlNodePtr) attrp, intern TSRMLS_CC);
xmlUnlinkNode((xmlNodePtr) attrp);
}
@@ -555,7 +550,6 @@
xmlUnlinkNode((xmlNodePtr) attrp);
xmlFreeProp(attrp);
} else {
- dom_add_to_list((xmlNodePtr) attrp, intern TSRMLS_CC);
xmlUnlinkNode((xmlNodePtr) attrp);
}
}
@@ -641,13 +635,11 @@
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);
}
}
@@ -661,8 +653,6 @@
if (existattrp == NULL) {
xmlReconciliateNs(nodep->doc, nodep);
}
-
- dom_del_from_list((xmlNodePtr) attrp, intern TSRMLS_CC);
/* Returns old property if removed otherwise NULL */
if (existattrp != NULL) {
Index: php4/ext/dom/document.c
diff -u php4/ext/dom/document.c:1.6 php4/ext/dom/document.c:1.7
--- php4/ext/dom/document.c:1.6 Thu Jun 12 16:02:05 2003
+++ php4/ext/dom/document.c Sun Jun 15 15:58:42 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: document.c,v 1.6 2003/06/12 20:02:05 rrichards Exp $ */
+/* $Id: document.c,v 1.7 2003/06/15 19:58:42 rrichards Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -428,7 +428,6 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
RETURN_FALSE;
}
- dom_add_to_list((xmlNodePtr) node, intern TSRMLS_CC);
DOM_RET_OBJ(rv, (xmlNodePtr) node, &ret, intern);
}
@@ -641,7 +634,6 @@
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 @@
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 @@
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 @@
RETURN_FALSE;
}
- dom_add_to_list(nodep, intern TSRMLS_CC);
DOM_RET_OBJ(rv, nodep, &ret, intern);
}
/* }}} end dom_document_create_attribute_ns */
@@ -996,6 +985,8 @@
php_dom_set_object(intern, docp TSRMLS_CC);
}
+
+ add_property_bool(id, "formatOutput", 0);
}
/* }}} end dom_document_document */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
