chregu Fri Nov 28 16:56:00 2003 EDT
Modified files:
/php-src/ext/dom element.c php_dom.c php_dom.h xml_common.h
Log:
changing dom_object_get_data to php_dom_object_get_data and PHP_DOM_EXPORT it
(by Rob Richards)
Index: php-src/ext/dom/element.c
diff -u php-src/ext/dom/element.c:1.19 php-src/ext/dom/element.c:1.20
--- php-src/ext/dom/element.c:1.19 Sun Oct 26 10:57:01 2003
+++ php-src/ext/dom/element.c Fri Nov 28 16:55:59 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: element.c,v 1.19 2003/10/26 15:57:01 rrichards Exp $ */
+/* $Id: element.c,v 1.20 2003/11/28 21:55:59 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -247,7 +247,7 @@
}
/* TODO: DTD defined attributes are handled special */
- if (dom_object_get_data((xmlNodePtr) attrp) == NULL) {
+ if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
node_list_unlink(attrp->children TSRMLS_CC);
xmlUnlinkNode((xmlNodePtr) attrp);
xmlFreeProp(attrp);
@@ -321,7 +321,7 @@
existattrp = xmlHasProp(nodep, attrp->name);
if (existattrp != NULL) {
- if ((oldobj = dom_object_get_data((xmlNodePtr) existattrp)) != NULL &&
+ if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) !=
NULL &&
((php_libxml_node_ptr *)oldobj->ptr)->node == (xmlNodePtr)
attrp)
{
RETURN_NULL();
@@ -588,7 +588,7 @@
}
if (attrp) {
- if (dom_object_get_data((xmlNodePtr) attrp) == NULL) {
+ if (php_dom_object_get_data((xmlNodePtr) attrp) == NULL) {
node_list_unlink(attrp->children TSRMLS_CC);
xmlUnlinkNode((xmlNodePtr) attrp);
xmlFreeProp(attrp);
@@ -672,7 +672,7 @@
}
if (existattrp != NULL) {
- if ((oldobj = dom_object_get_data((xmlNodePtr) existattrp)) != NULL &&
+ if ((oldobj = php_dom_object_get_data((xmlNodePtr) existattrp)) !=
NULL &&
((php_libxml_node_ptr *)oldobj->ptr)->node == (xmlNodePtr)
attrp)
{
RETURN_NULL();
Index: php-src/ext/dom/php_dom.c
diff -u php-src/ext/dom/php_dom.c:1.39 php-src/ext/dom/php_dom.c:1.40
--- php-src/ext/dom/php_dom.c:1.39 Sun Oct 26 10:57:02 2003
+++ php-src/ext/dom/php_dom.c Fri Nov 28 16:55:59 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.c,v 1.39 2003/10/26 15:57:02 rrichards Exp $ */
+/* $Id: php_dom.c,v 1.40 2003/11/28 21:55:59 chregu Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -160,8 +160,8 @@
}
/* }}} end dom_object_get_node */
-/* {{{ dom_object *dom_object_get_data(xmlNodePtr obj) */
-dom_object *dom_object_get_data(xmlNodePtr obj)
+/* {{{ dom_object *php_dom_object_get_data(xmlNodePtr obj) */
+dom_object *php_dom_object_get_data(xmlNodePtr obj)
{
if (obj->_private != NULL) {
return (dom_object *) ((php_libxml_node_ptr *)
obj->_private)->_private;
@@ -169,7 +169,7 @@
return NULL;
}
}
-/* }}} end dom_object_get_data */
+/* }}} end php_dom_object_get_data */
/* {{{ dom_read_na */
static int dom_read_na(dom_object *obj, zval **retval TSRMLS_DC)
@@ -697,7 +697,7 @@
while (node != NULL) {
- wrapper = dom_object_get_data(node);
+ wrapper = php_dom_object_get_data(node);
if (wrapper != NULL ) {
xmlUnlinkNode(node);
@@ -852,7 +852,7 @@
return wrapper;
}
- if ((intern = (dom_object *) dom_object_get_data((void *) obj))) {
+ if ((intern = (dom_object *) php_dom_object_get_data((void *) obj))) {
return_value->type = IS_OBJECT;
return_value->is_ref = 1;
return_value->value.obj.handle = intern->handle;
Index: php-src/ext/dom/php_dom.h
diff -u php-src/ext/dom/php_dom.h:1.17 php-src/ext/dom/php_dom.h:1.18
--- php-src/ext/dom/php_dom.h:1.17 Sun Oct 26 10:57:02 2003
+++ php-src/ext/dom/php_dom.h Fri Nov 28 16:55:59 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_dom.h,v 1.17 2003/10/26 15:57:02 rrichards Exp $ */
+/* $Id: php_dom.h,v 1.18 2003/11/28 21:55:59 chregu Exp $ */
#ifndef PHP_DOM_H
#define PHP_DOM_H
@@ -36,6 +36,7 @@
#include <libxml/uri.h>
#include <libxml/xmlerror.h>
#include <libxml/xinclude.h>
+#include <libxml/hash.h>
#if defined(LIBXML_HTML_ENABLED)
#include <libxml/HTMLparser.h>
#include <libxml/HTMLtree.h>
Index: php-src/ext/dom/xml_common.h
diff -u php-src/ext/dom/xml_common.h:1.15 php-src/ext/dom/xml_common.h:1.16
--- php-src/ext/dom/xml_common.h:1.15 Sun Oct 26 10:57:02 2003
+++ php-src/ext/dom/xml_common.h Fri Nov 28 16:55:59 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xml_common.h,v 1.15 2003/10/26 15:57:02 rrichards Exp $ */
+/* $Id: xml_common.h,v 1.16 2003/11/28 21:55:59 chregu Exp $ */
#ifndef PHP_XML_COMMON_H
#define PHP_XML_COMMON_H
@@ -56,9 +56,8 @@
#define PHP_DOM_EXPORT(__type) PHPAPI __type
+PHP_DOM_EXPORT(dom_object *) php_dom_object_get_data(xmlNodePtr obj);
PHP_DOM_EXPORT(zval *) php_dom_create_object(xmlNodePtr obj, int *found, zval *in,
zval* return_value, dom_object *domobj TSRMLS_DC);
-PHP_DOM_EXPORT(zval *) dom_read_property(zval *object, zval *member, zend_bool silent
TSRMLS_DC);
-PHP_DOM_EXPORT(void) dom_write_property(zval *object, zval *member, zval *value
TSRMLS_DC);
#define DOM_XMLNS_NAMESPACE \
(const xmlChar *) "http://www.w3.org/2000/xmlns/";
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
