cvs: php4 /ext/domxml php_domxml.c php_domxml.h
| From: | Christian Stocker | Date: | Fri, 03 May 2002 13:53:46 +0000 |
| Subject: | cvs: php4 /ext/domxml php_domxml.c php_domxml.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-11654@lists.php.net to get a copy of this message | ||
chregu Fri May 3 09:53:46 2002 EDT
Modified files:
/php4/ext/domxml php_domxml.c php_domxml.h
Log:
removed the function for domxml_node_add_child and made an alias to
domxml_node_append_child for BC
Index: php4/ext/domxml/php_domxml.c
diff -u php4/ext/domxml/php_domxml.c:1.148 php4/ext/domxml/php_domxml.c:1.149
--- php4/ext/domxml/php_domxml.c:1.148 Fri May 3 05:51:06 2002
+++ php4/ext/domxml/php_domxml.c Fri May 3 09:53:45 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.c,v 1.148 2002/05/03 09:51:06 chregu Exp $ */
+/* $Id: php_domxml.c,v 1.149 2002/05/03 13:53:45 chregu Exp $ */
/* TODO
* - Support Notation Nodes
@@ -344,7 +344,7 @@
PHP_FALIAS(prefix, domxml_node_prefix, NULL)
PHP_FALIAS(clone_node, domxml_clone_node, NULL)
/* Non DOM functions start here */
- PHP_FALIAS(add_child, domxml_node_add_child, NULL)
+ PHP_FALIAS(add_child, domxml_node_append_child, NULL)
PHP_FALIAS(append_sibling, domxml_node_append_sibling, NULL)
PHP_FALIAS(node, domxml_node, NULL)
PHP_FALIAS(unlink, domxml_node_unlink_node, NULL)
@@ -1965,43 +1965,6 @@
shutdown. */
/*xmlFreeNode(nodep);
zval_dtor(id);*/ /* This is not enough because the children won't be deleted */
-}
-/* }}} */
-
-/* {{{ proto object domxml_node_add_child(object domnode)
- Adds existing node to parent node */
-PHP_FUNCTION(domxml_node_add_child)
-{
- zval *id, *rv, *node;
- xmlNodePtr child, nodep, new_child;
- int ret;
-
- DOMXML_GET_THIS_OBJ(nodep, id, le_domxmlnodep);
-
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o", &node) == FAILURE) {
- return;
- }
-
- DOMXML_GET_OBJ(child, node, le_domxmlnodep);
-
- if (child->type == XML_ATTRIBUTE_NODE) {
- php_error(E_WARNING, "%s(): can't add attribute node",
get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
- if (NULL == (new_child = xmlCopyNode(child, 1))) {
- php_error(E_WARNING, "%s(): unable to clone node", get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
- child = xmlAddChild(nodep, new_child);
-
- if (NULL == child) {
- php_error(E_WARNING, "%s(): couldn't add child",
get_active_function_name(TSRMLS_C));
- RETURN_FALSE;
- }
-
- DOMXML_RET_OBJ(rv, child, &ret);
}
/* }}} */
Index: php4/ext/domxml/php_domxml.h
diff -u php4/ext/domxml/php_domxml.h:1.51 php4/ext/domxml/php_domxml.h:1.52
--- php4/ext/domxml/php_domxml.h:1.51 Tue Apr 30 01:18:12 2002
+++ php4/ext/domxml/php_domxml.h Fri May 3 09:53:46 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_domxml.h,v 1.51 2002/04/30 05:18:12 steinm Exp $ */
+/* $Id: php_domxml.h,v 1.52 2002/05/03 13:53:46 chregu Exp $ */
#ifndef PHP_DOMXML_H
#define PHP_DOMXML_H
@@ -113,7 +113,6 @@
PHP_FUNCTION(domxml_node_append_child);
PHP_FUNCTION(domxml_node_remove_child);
PHP_FUNCTION(domxml_node_replace_child);
-PHP_FUNCTION(domxml_node_add_child);
PHP_FUNCTION(domxml_node_has_attributes);
PHP_FUNCTION(domxml_node_has_child_nodes);
PHP_FUNCTION(domxml_node_parent);