cvs: /php4/ext/domxml domxml.c php_domxml.h /php4/tests testdom

steinm Thu Feb 17 07:05:53 2000 EDT Modified files: /php4/ext/domxml domxml.c php_domxml.h /php4/tests testdom Log: - change some function name into php style Index: php4/ext/domxml/domxml.c diff -u php4/ext/domxml/domxml.c:1.14 php4/ext/domxml/domxml.c:1.15 --- php4/ext/domxml/domxml.c:1.14 Thu Feb 10 07:24:13 2000 +++ php4/ext/domxml/domxml.c Thu Feb 17 07:05:22 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domxml.c,v 1.14 2000/02/10 15:24:13 steinm Exp $ */ +/* $Id: domxml.c,v 1.15 2000/02/17 15:05:22 steinm Exp $ */ #include "php.h" @@ -38,23 +38,23 @@ PHP_FE(xmldocfile, NULL) PHP_FE(xmltree, NULL) PHP_FE(domxml_root, NULL) - PHP_FE(domxml_addroot, NULL) + PHP_FE(domxml_add_root, NULL) PHP_FE(domxml_dumpmem, NULL) PHP_FE(domxml_attributes, NULL) PHP_FE(domxml_getattr, NULL) PHP_FE(domxml_setattr, NULL) PHP_FE(domxml_children, NULL) - PHP_FE(domxml_newchild, NULL) + PHP_FE(domxml_new_child, NULL) PHP_FE(domxml_node, NULL) - PHP_FE(domxml_newxmldoc, NULL) - PHP_FALIAS(newxmldoc, domxml_newxmldoc, NULL) + PHP_FE(domxml_new_xmldoc, NULL) + PHP_FALIAS(new_xmldoc, domxml_new_xmldoc, NULL) {NULL, NULL, NULL} }; static zend_function_entry php_domxmldoc_class_functions[] = { PHP_FALIAS(root, domxml_root, NULL) - PHP_FALIAS(addroot, domxml_addroot, NULL) + PHP_FALIAS(add_root, domxml_add_root, NULL) PHP_FALIAS(dtd, domxml_intdtd, NULL) PHP_FALIAS(dumpmem, domxml_dumpmem, NULL) {NULL, NULL, NULL} @@ -72,7 +72,7 @@ PHP_FALIAS(lastchild, domxml_lastchild, NULL) PHP_FALIAS(children, domxml_children, NULL) PHP_FALIAS(parent, domxml_parent, NULL) - PHP_FALIAS(newchild, domxml_newchild, NULL) + PHP_FALIAS(new_child, domxml_new_child, NULL) PHP_FALIAS(getattr, domxml_getattr, NULL) PHP_FALIAS(setattr, domxml_setattr, NULL) PHP_FALIAS(attributes, domxml_attributes, NULL) @@ -738,9 +738,9 @@ } /* }}} */ -/* {{{ proto string domxml_newchild([int node_handle], string name, string content) +/* {{{ proto string domxml_new_child([int node_handle], string name, string content) Adds child node to parent node */ -PHP_FUNCTION(domxml_newchild) +PHP_FUNCTION(domxml_new_child) { zval *id, *name, *content, **tmp; int id_to_find; @@ -796,9 +796,9 @@ } /* }}} */ -/* {{{ proto string domxml_addroot([int doc_handle], string name) +/* {{{ proto string domxml_add_root([int doc_handle], string name) Adds root node to document */ -PHP_FUNCTION(domxml_addroot) +PHP_FUNCTION(domxml_add_root) { zval *id, *name, **tmp; int id_to_find; @@ -852,9 +852,9 @@ } /* }}} */ -/* {{{ proto class domxml_newxmldoc(string version) +/* {{{ proto class domxml_new_xmldoc(string version) Creates new xmldoc */ -PHP_FUNCTION(domxml_newxmldoc) +PHP_FUNCTION(domxml_new_xmldoc) { zval *arg; xmlDoc *docp; Index: php4/ext/domxml/php_domxml.h diff -u php4/ext/domxml/php_domxml.h:1.8 php4/ext/domxml/php_domxml.h:1.9 --- php4/ext/domxml/php_domxml.h:1.8 Thu Feb 10 07:24:13 2000 +++ php4/ext/domxml/php_domxml.h Thu Feb 17 07:05:22 2000 @@ -29,7 +29,7 @@ */ -/* $Id: php_domxml.h,v 1.8 2000/02/10 15:24:13 steinm Exp $ */ +/* $Id: php_domxml.h,v 1.9 2000/02/17 15:05:22 steinm Exp $ */ #ifndef _PHP_DOMXML_H #define _PHP_DOMXML_H @@ -46,11 +46,11 @@ PHP_FUNCTION(xmldoc); PHP_FUNCTION(xmldocfile); PHP_FUNCTION(xmltree); -PHP_FUNCTION(domxml_newxmldoc); +PHP_FUNCTION(domxml_new_xmldoc); /* Class Document methods */ PHP_FUNCTION(domxml_root); -PHP_FUNCTION(domxml_addroot); +PHP_FUNCTION(domxml_add_root); PHP_FUNCTION(domxml_intdtd); PHP_FUNCTION(domxml_dumpmem); @@ -62,7 +62,7 @@ PHP_FUNCTION(domxml_lastchild); PHP_FUNCTION(domxml_parent); PHP_FUNCTION(domxml_node); -PHP_FUNCTION(domxml_newchild); +PHP_FUNCTION(domxml_new_child); /* Class Attribute methods */ PHP_FUNCTION(domxml_attrname); Index: php4/tests/testdom diff -u php4/tests/testdom:1.7 php4/tests/testdom:1.8 --- php4/tests/testdom:1.7 Thu Feb 10 07:24:13 2000 +++ php4/tests/testdom Thu Feb 17 07:05:23 2000 @@ -69,14 +69,14 @@ /* The following builds a xml document from scratch */ echo "Test 3: building a xml document from scratch\n"; -$doc = newxmldoc("1.0"); -$root = $doc->addroot("HTML"); -$head = $root->newchild("HEAD", ""); -$head->newchild("TITLE", "Hier der Titel"); -$body = $root->newchild("BODY", ""); -$table = $body->newchild("TABLE", ""); +$doc = new_xmldoc("1.0"); +$root = $doc->add_root("HTML"); +$head = $root->new_child("HEAD", ""); +$head->new_child("TITLE", "Hier der Titel"); +$body = $root->new_child("BODY", ""); +$table = $body->new_child("TABLE", ""); $table->setattr("WIDTH", "100%"); -$table->newchild("TR", " "); +$table->new_child("TR", " "); echo $doc->dumpmem(); ?>