clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

changing dom_object_get_data to php_dom_object_get_data and PHP_DOM_EXPORT it

Browse Source 
(by Rob Richards)
This commit is contained in:
Christian Stocker 2003-11-28 21:55:59 +00:00
parent e1bdc33d18
commit 29a46b2ff6
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/dom/element.c
View File

@ -247,7 +247,7 @@ PHP_FUNCTION(dom_element_remove_attribute)
}
/* 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 @@ PHP_FUNCTION(dom_element_set_attribute_node)
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 @@ PHP_FUNCTION(dom_element_remove_attribute_ns)
}
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 @@ PHP_FUNCTION(dom_element_set_attribute_node_ns)
}
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();

10
ext/dom/php_dom.c
View File

@ -160,8 +160,8 @@ xmlNodePtr dom_object_get_node(dom_object *obj)
}
/* }}} 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 @@ dom_object *dom_object_get_data(xmlNodePtr obj)
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 @@ void node_list_unlink(xmlNodePtr node TSRMLS_DC)
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 @@ zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *wrapper_in, zval *
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;

1
ext/dom/php_dom.h
View File

@ -36,6 +36,7 @@ extern zend_module_entry dom_module_entry;
#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>

3
ext/dom/xml_common.h
View File

@ -56,9 +56,8 @@ typedef struct _dom_object {
#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/"