cvs: php-src(PHP_5_3) /ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c documenttype.c dom_ce.h dom_fe.h
dom_iterators.c dom_properties.h domconfiguration.c domerror.c domerrorhandler.c domexception.c domimplementation.c domimplementationlist.c
domimplementationsource.c domlocator.c domstringlist.c element.c entity.c entityreference.c namednodemap.c namelist.c node.c nodelist.c notation.c
php_dom.c php_dom.h processinginstruction.c string_extend.c text.c typeinfo.c userdatahandler.c xml_common.h xpath.c

tony2001 Thu Aug 14 08:39:05 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/dom attr.c cdatasection.c characterdata.c comment.c document.c documentfragment.c documenttype.c dom_ce.h dom_fe.h dom_iterators.c dom_properties.h domconfiguration.c domerror.c domerrorhandler.c domexception.c domimplementation.c domimplementationlist.c domimplementationsource.c domlocator.c domstringlist.c element.c entity.c entityreference.c namednodemap.c namelist.c node.c nodelist.c notation.c php_dom.c php_dom.h processinginstruction.c string_extend.c text.c typeinfo.c userdatahandler.c xml_common.h xpath.c Log: MFH: fix ws, cs and folding

http://cvs.php.net/viewvc.cgi/php-src/ext/dom/attr.c?r1=1.18.2.2.2.2.2.5&r2=1.18.2.2.2.2.2.6&diff_format=u Index: php-src/ext/dom/attr.c diff -u php-src/ext/dom/attr.c:1.18.2.2.2.2.2.5 php-src/ext/dom/attr.c:1.18.2.2.2.2.2.6 --- php-src/ext/dom/attr.c:1.18.2.2.2.2.2.5 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/attr.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: attr.c,v 1.18.2.2.2.2.2.5 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: attr.c,v 1.18.2.2.2.2.2.6 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -29,7 +29,6 @@ #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_attr_is_id, 0, 0, 0) @@ -99,7 +98,6 @@ /* }}} end DOMAttr::__construct */ - /* {{{ name string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-1112119403 @@ -124,8 +122,6 @@ /* }}} */ - - /* {{{ specified boolean readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-862529273 @@ -141,8 +137,6 @@ /* }}} */ - - /* {{{ value string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-221662474 @@ -210,8 +204,6 @@ /* }}} */ - - /* {{{ ownerElement DOMElement readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-ownerElement @@ -246,8 +238,6 @@ /* }}} */ - - /* {{{ schemaTypeInfo DOMTypeInfo readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-schemaTypeInfo @@ -263,8 +253,6 @@ /* }}} */ - - /* {{{ proto boolean dom_attr_is_id(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId Since: DOM Level 3 @@ -290,3 +278,12 @@ /* }}} end dom_attr_is_id */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/cdatasection.c?r1=1.11.2.1.2.1.2.4&r2=1.11.2.1.2.1.2.5&diff_format=u Index: php-src/ext/dom/cdatasection.c diff -u php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.4 php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.5 --- php-src/ext/dom/cdatasection.c:1.11.2.1.2.1.2.4 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/cdatasection.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.4 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: cdatasection.c,v 1.11.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -83,3 +83,12 @@ /* }}} end DOMCdataSection::__construct */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/characterdata.c?r1=1.15.2.1.2.2.2.4&r2=1.15.2.1.2.2.2.5&diff_format=u Index: php-src/ext/dom/characterdata.c diff -u php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.4 php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.5 --- php-src/ext/dom/characterdata.c:1.15.2.1.2.2.2.4 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/characterdata.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: characterdata.c,v 1.15.2.1.2.2.2.4 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: characterdata.c,v 1.15.2.1.2.2.2.5 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -171,7 +171,6 @@ /* }}} */ - /* {{{ proto string dom_characterdata_substring_data(int offset, int count); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF Since: @@ -221,7 +220,6 @@ } /* }}} end dom_characterdata_substring_data */ - /* {{{ proto void dom_characterdata_append_data(string arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F Since: @@ -256,7 +254,6 @@ } /* }}} end dom_characterdata_append_data */ - /* {{{ proto void dom_characterdata_insert_data(int offset, string arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F Since: @@ -305,7 +302,6 @@ } /* }}} end dom_characterdata_insert_data */ - /* {{{ proto void dom_characterdata_delete_data(int offset, int count); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781 Since: @@ -361,7 +357,6 @@ } /* }}} end dom_characterdata_delete_data */ - /* {{{ proto void dom_characterdata_replace_data(int offset, int count, string arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB Since: @@ -423,4 +418,14 @@ RETURN_TRUE; } /* }}} end dom_characterdata_replace_data */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/comment.c?r1=1.11.2.1.2.1.2.4&r2=1.11.2.1.2.1.2.5&diff_format=u Index: php-src/ext/dom/comment.c diff -u php-src/ext/dom/comment.c:1.11.2.1.2.1.2.4 php-src/ext/dom/comment.c:1.11.2.1.2.1.2.5 --- php-src/ext/dom/comment.c:1.11.2.1.2.1.2.4 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/comment.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: comment.c,v 1.11.2.1.2.1.2.4 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: comment.c,v 1.11.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -81,4 +81,14 @@ } } /* }}} end DOMComment::__construct */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/document.c?r1=1.68.2.3.2.5.2.6&r2=1.68.2.3.2.5.2.7&diff_format=u Index: php-src/ext/dom/document.c diff -u php-src/ext/dom/document.c:1.68.2.3.2.5.2.6 php-src/ext/dom/document.c:1.68.2.3.2.5.2.7 --- php-src/ext/dom/document.c:1.68.2.3.2.5.2.6 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/document.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: document.c,v 1.68.2.3.2.5.2.6 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: document.c,v 1.68.2.3.2.5.2.7 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -224,7 +224,7 @@ * Since: */ -const zend_function_entry php_dom_document_class_functions[] = { +const zend_function_entry php_dom_document_class_functions[] = { /* {{{ */ PHP_FALIAS(createElement, dom_document_create_element, arginfo_dom_document_create_element) PHP_FALIAS(createDocumentFragment, dom_document_create_document_fragment, arginfo_dom_document_create_document_fragment) PHP_FALIAS(createTextNode, dom_document_create_text_node, arginfo_dom_document_create_text_node) @@ -264,6 +264,7 @@ PHP_ME(domdocument, registerNodeClass, arginfo_dom_document_registernodeclass, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; +/* }}} */ /* {{{ docType DOMDocumentType readonly=yes @@ -299,8 +300,6 @@ /* }}} */ - - /* {{{ implementation DOMImplementation readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1B793EBA @@ -315,8 +314,6 @@ /* }}} */ - - /* {{{ documentElement DOMElement readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-87CD092 @@ -421,8 +418,6 @@ /* }}} */ - - /* {{{ standalone boolean readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-standalone @@ -487,8 +482,6 @@ /* }}} */ - - /* {{{ version string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-version @@ -683,7 +676,6 @@ } /* }}} */ - /* {{{ resolveExternals boolean readonly=no */ @@ -726,7 +718,6 @@ } /* }}} */ - /* {{{ preserveWhiteSpace boolean readonly=no */ @@ -811,7 +802,6 @@ } /* }}} */ - /* {{{ substituteEntities boolean readonly=no */ @@ -854,7 +844,6 @@ } /* }}} */ - /* {{{ documentURI string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-documentURI @@ -919,8 +908,6 @@ /* }}} */ - - /* {{{ config DOMConfiguration readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-config @@ -935,8 +922,6 @@ /* }}} */ - - /* {{{ proto DOMElement dom_document_create_element(string tagName [, string value]); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547 Since: @@ -970,7 +955,6 @@ } /* }}} end dom_document_create_element */ - /* {{{ proto DOMDocumentFragment dom_document_create_document_fragment(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5 Since: @@ -998,7 +982,6 @@ } /* }}} end dom_document_create_document_fragment */ - /* {{{ proto DOMText dom_document_create_text_node(string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127 Since: @@ -1027,7 +1010,6 @@ } /* }}} end dom_document_create_text_node */ - /* {{{ proto DOMComment dom_document_create_comment(string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328 Since: @@ -1056,7 +1038,6 @@ } /* }}} end dom_document_create_comment */ - /* {{{ proto DOMCdataSection dom_document_create_cdatasection(string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8 Since: @@ -1085,7 +1066,6 @@ } /* }}} end dom_document_create_cdatasection */ - /* {{{ proto DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439 Since: @@ -1121,7 +1101,6 @@ } /* }}} end dom_document_create_processing_instruction */ - /* {{{ proto DOMAttr dom_document_create_attribute(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198 Since: @@ -1156,7 +1135,6 @@ } /* }}} end dom_document_create_attribute */ - /* {{{ proto DOMEntityReference dom_document_create_entity_reference(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE Since: @@ -1190,7 +1168,6 @@ } /* }}} end dom_document_create_entity_reference */ - /* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name(string tagname); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094 Since: @@ -1217,7 +1194,6 @@ } /* }}} end dom_document_get_elements_by_tag_name */ - /* {{{ proto DOMNode dom_document_import_node(DOMNode importedNode, boolean deep); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode Since: DOM Level 2 @@ -1260,7 +1236,6 @@ } /* }}} end dom_document_import_node */ - /* {{{ proto DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value]); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS Since: DOM Level 2 @@ -1324,7 +1299,6 @@ } /* }}} end dom_document_create_element_ns */ - /* {{{ proto DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS Since: DOM Level 2 @@ -1390,7 +1364,6 @@ } /* }}} end dom_document_create_attribute_ns */ - /* {{{ proto DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS Since: DOM Level 2 @@ -1418,7 +1391,6 @@ } /* }}} end dom_document_get_elements_by_tag_name_ns */ - /* {{{ proto DOMElement dom_document_get_element_by_id(string elementId); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId Since: DOM Level 2 @@ -1449,7 +1421,6 @@ } /* }}} end dom_document_get_element_by_id */ - /* {{{ proto DOMNode dom_document_adopt_node(DOMNode source); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode Since: DOM Level 3 @@ -1460,7 +1431,6 @@ } /* }}} end dom_document_adopt_node */ - /* {{{ proto void dom_document_normalize_document(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument Since: DOM Level 3 @@ -1481,7 +1451,6 @@ } /* }}} end dom_document_normalize_document */ - /* {{{ proto DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode Since: DOM Level 3 @@ -1539,7 +1508,8 @@ } /* }}} end DOMDocument::__construct */ -char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len TSRMLS_DC) { +char *_dom_get_valid_file_path(char *source, char *resolved_path, int resolved_path_len TSRMLS_DC) /* {{{ */ +{ xmlURI *uri; xmlChar *escsource; char *file_dest; @@ -1584,10 +1554,10 @@ return file_dest; } +/* }}} */ - -/* {{{ */ -static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int options TSRMLS_DC) { +static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, int options TSRMLS_DC) /* {{{ */ +{ xmlDocPtr ret; xmlParserCtxtPtr ctxt = NULL; dom_doc_propsptr doc_props; @@ -1895,7 +1865,8 @@ } /* }}} end dom_document_savexml */ -static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur TSRMLS_DC) { +static xmlNodePtr php_dom_free_xinclude_node(xmlNodePtr cur TSRMLS_DC) /* {{{ */ +{ xmlNodePtr xincnode; xincnode = cur; @@ -1905,8 +1876,10 @@ return cur; } +/* }}} */ -static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) { +static void php_dom_remove_xinclude_nodes(xmlNodePtr cur TSRMLS_DC) /* {{{ */ +{ while(cur) { if (cur->type == XML_XINCLUDE_START) { cur = php_dom_free_xinclude_node(cur TSRMLS_CC); @@ -1931,6 +1904,7 @@ } } } +/* }}} */ /* {{{ proto int dom_document_xinclude([int options]) Substitutues xincludes in a DomDocument */ @@ -1970,7 +1944,7 @@ } } - +/* }}} */ /* {{{ proto boolean dom_document_validate(); Since: DOM extended @@ -2007,11 +1981,10 @@ xmlFreeValidCtxt(cvp); } - +/* }}} */ #if defined(LIBXML_SCHEMAS_ENABLED) -static void -_dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) +static void _dom_document_schema_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ { zval *id; xmlDoc *docp; @@ -2084,6 +2057,7 @@ RETURN_FALSE; } } +/* }}} */ /* {{{ proto boolean dom_document_schema_validate_file(string filename); */ PHP_FUNCTION(dom_document_schema_validate_file) @@ -2099,9 +2073,7 @@ } /* }}} end dom_document_schema_validate */ - -static void -_dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type) +static void _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ { zval *id; xmlDoc *docp; @@ -2174,6 +2146,7 @@ RETURN_FALSE; } } +/* }}} */ /* {{{ proto boolean dom_document_relaxNG_validate_file(string filename); */ PHP_FUNCTION(dom_document_relaxNG_validate_file) @@ -2193,7 +2166,7 @@ #if defined(LIBXML_HTML_ENABLED) -static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) +static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ { zval *id, *rv = NULL; xmlDoc *docp = NULL, *newdoc; @@ -2266,6 +2239,7 @@ DOM_RET_OBJ(rv, (xmlNodePtr) newdoc, &ret, NULL); } } +/* }}} */ /* {{{ proto DOMNode dom_document_load_html_file(string source); Since: DOM extended @@ -2405,3 +2379,12 @@ /* }}} */ #endif /* HAVE_LIBXML && HAVE_DOM */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documentfragment.c?r1=1.15.2.1.2.1.2.4&r2=1.15.2.1.2.1.2.5&diff_format=u Index: php-src/ext/dom/documentfragment.c diff -u php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.4 php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.5 --- php-src/ext/dom/documentfragment.c:1.15.2.1.2.1.2.4 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/documentfragment.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.4 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: documentfragment.c,v 1.15.2.1.2.1.2.5 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_documentfragement_construct, 0, 0, 0) @@ -88,7 +87,8 @@ /* php_dom_xmlSetTreeDoc is a custom implementation of xmlSetTreeDoc needed for hack in appendXML due to libxml bug - no need to share this function */ -static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) { +static void php_dom_xmlSetTreeDoc(xmlNodePtr tree, xmlDocPtr doc) /* {{{ */ +{ xmlAttrPtr prop; xmlNodePtr cur; @@ -117,6 +117,7 @@ tree->doc = doc; } } +/* }}} */ /* {{{ proto void DOMDocumentFragment::appendXML(string data); */ PHP_METHOD(domdocumentfragment, appendXML) { @@ -154,5 +155,15 @@ RETURN_TRUE; } +/* }}} */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/documenttype.c?r1=1.15.2.1.2.1.2.2&r2=1.15.2.1.2.1.2.3&diff_format=u Index: php-src/ext/dom/documenttype.c diff -u php-src/ext/dom/documenttype.c:1.15.2.1.2.1.2.2 php-src/ext/dom/documenttype.c:1.15.2.1.2.1.2.3 --- php-src/ext/dom/documenttype.c:1.15.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/documenttype.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: documenttype.c,v 1.15.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: documenttype.c,v 1.15.2.1.2.1.2.3 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -62,8 +62,6 @@ /* }}} */ - - /* {{{ entities DOMNamedNodeMap readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1788794630 @@ -95,8 +93,6 @@ /* }}} */ - - /* {{{ notations DOMNamedNodeMap readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D46829EF @@ -128,8 +124,6 @@ /* }}} */ - - /* {{{ publicId string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-publicId @@ -158,8 +152,6 @@ /* }}} */ - - /* {{{ systemId string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-systemId @@ -187,8 +179,6 @@ /* }}} */ - - /* {{{ internalSubset string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-Core-DocType-internalSubset @@ -232,3 +222,12 @@ /* }}} */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/dom_ce.h?r1=1.8.2.1.2.1.2.1&r2=1.8.2.1.2.1.2.2&diff_format=u Index: php-src/ext/dom/dom_ce.h diff -u php-src/ext/dom/dom_ce.h:1.8.2.1.2.1.2.1 php-src/ext/dom/dom_ce.h:1.8.2.1.2.1.2.2 --- php-src/ext/dom/dom_ce.h:1.8.2.1.2.1.2.1 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/dom_ce.h Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dom_ce.h,v 1.8.2.1.2.1.2.1 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: dom_ce.h,v 1.8.2.1.2.1.2.2 2008/08/14 08:39:04 tony2001 Exp $ */ #ifndef DOM_CE_H #define DOM_CE_H @@ -55,3 +55,12 @@ extern zend_class_entry *dom_namespace_node_class_entry; #endif /* DOM_CE_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/dom_fe.h?r1=1.14.2.1.2.4.2.3&r2=1.14.2.1.2.4.2.4&diff_format=u Index: php-src/ext/dom/dom_fe.h diff -u php-src/ext/dom/dom_fe.h:1.14.2.1.2.4.2.3 php-src/ext/dom/dom_fe.h:1.14.2.1.2.4.2.4 --- php-src/ext/dom/dom_fe.h:1.14.2.1.2.4.2.3 Fri Jan 25 16:13:04 2008 +++ php-src/ext/dom/dom_fe.h Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dom_fe.h,v 1.14.2.1.2.4.2.3 2008/01/25 16:13:04 rrichards Exp $ */ +/* $Id: dom_fe.h,v 1.14.2.1.2.4.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifndef DOM_FE_H #define DOM_FE_H @@ -268,3 +268,12 @@ #endif #endif /* DOM_FE_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/dom_iterators.c?r1=1.9.2.3.2.5.2.2&r2=1.9.2.3.2.5.2.3&diff_format=u Index: php-src/ext/dom/dom_iterators.c diff -u php-src/ext/dom/dom_iterators.c:1.9.2.3.2.5.2.2 php-src/ext/dom/dom_iterators.c:1.9.2.3.2.5.2.3 --- php-src/ext/dom/dom_iterators.c:1.9.2.3.2.5.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/dom_iterators.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dom_iterators.c,v 1.9.2.3.2.5.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: dom_iterators.c,v 1.9.2.3.2.5.2.3 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,7 +42,8 @@ xmlNotation *notation; }; -static void itemHashScanner (void *payload, void *data, xmlChar *name) { +static void itemHashScanner (void *payload, void *data, xmlChar *name) /* {{{ */ +{ nodeIterator *priv = (nodeIterator *)data; if(priv->cur < priv->index) { @@ -53,9 +54,10 @@ } } } +/* }}} */ -xmlNodePtr create_notation(const xmlChar *name, - const xmlChar *ExternalID, const xmlChar *SystemID) { +xmlNodePtr create_notation(const xmlChar *name, const xmlChar *ExternalID, const xmlChar *SystemID) /* {{{ */ +{ xmlEntityPtr ret; ret = (xmlEntityPtr) xmlMalloc(sizeof(xmlEntity)); @@ -76,8 +78,9 @@ ret->prev = NULL; return((xmlNodePtr) ret); } +/* }}} */ -xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index) +xmlNode *php_dom_libxml_hash_iter(xmlHashTable *ht, int index) /* {{{ */ { xmlNode *nodep = NULL; nodeIterator *iter; @@ -96,8 +99,9 @@ return NULL; } } +/* }}} */ -xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index) +xmlNode *php_dom_libxml_notation_iter(xmlHashTable *ht, int index) /* {{{ */ { notationIterator *iter; xmlNotation *notep = NULL; @@ -116,8 +120,9 @@ return NULL; } } +/* }}} */ -static void php_dom_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) +static void php_dom_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ { php_dom_iterator *iterator = (php_dom_iterator *)iter; @@ -129,8 +134,9 @@ efree(iterator); } +/* }}} */ -static int php_dom_iterator_valid(zend_object_iterator *iter TSRMLS_DC) +static int php_dom_iterator_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ { php_dom_iterator *iterator = (php_dom_iterator *)iter; @@ -141,15 +147,17 @@ return FAILURE; } } +/* }}} */ -static void php_dom_iterator_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) +static void php_dom_iterator_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) /* {{{ */ { php_dom_iterator *iterator = (php_dom_iterator *)iter; *data = &iterator->curobj; } +/* }}} */ -static int php_dom_iterator_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) +static int php_dom_iterator_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) /* {{{ */ { zval *curobj; xmlNodePtr curnode = NULL; @@ -180,8 +188,9 @@ return HASH_KEY_IS_STRING; } } +/* }}} */ -static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) +static void php_dom_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) /* {{{ */ { zval *curobj, *curattr = NULL; zval *object; @@ -247,6 +256,7 @@ iterator->curobj = curattr; } +/* }}} */ zend_object_iterator_funcs php_dom_iterator_funcs = { php_dom_iterator_dtor, @@ -257,7 +267,7 @@ NULL }; -zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) +zend_object_iterator *php_dom_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) /* {{{ */ { dom_object *intern; dom_nnodemap_object *objmap; @@ -327,5 +337,15 @@ return (zend_object_iterator*)iterator; } +/* }}} */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/dom_properties.h?r1=1.7.2.1.2.1.2.1&r2=1.7.2.1.2.1.2.2&diff_format=u Index: php-src/ext/dom/dom_properties.h diff -u php-src/ext/dom/dom_properties.h:1.7.2.1.2.1.2.1 php-src/ext/dom/dom_properties.h:1.7.2.1.2.1.2.2 --- php-src/ext/dom/dom_properties.h:1.7.2.1.2.1.2.1 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/dom_properties.h Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: dom_properties.h,v 1.7.2.1.2.1.2.1 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: dom_properties.h,v 1.7.2.1.2.1.2.2 2008/08/14 08:39:04 tony2001 Exp $ */ #ifndef DOM_PROPERTIES_H #define DOM_PROPERTIES_H @@ -160,3 +160,12 @@ #endif #endif /* DOM_PROPERTIERS_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domconfiguration.c?r1=1.5.2.1.2.1.2.3&r2=1.5.2.1.2.1.2.4&diff_format=u Index: php-src/ext/dom/domconfiguration.c diff -u php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.3 php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.4 --- php-src/ext/dom/domconfiguration.c:1.5.2.1.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/domconfiguration.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domconfiguration.c,v 1.5.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: domconfiguration.c,v 1.5.2.1.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_configuration_set_parameter, 0, 0, 2) @@ -63,7 +62,6 @@ /* {{{ attribute protos, not implemented yet */ - /* {{{ proto dom_void dom_domconfiguration_set_parameter(string name, domuserdata value); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-property Since: @@ -74,7 +72,6 @@ } /* }}} end dom_domconfiguration_set_parameter */ - /* {{{ proto domdomuserdata dom_domconfiguration_get_parameter(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-getParameter Since: @@ -85,7 +82,6 @@ } /* }}} end dom_domconfiguration_get_parameter */ - /* {{{ proto boolean dom_domconfiguration_can_set_parameter(string name, domuserdata value); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-canSetParameter Since: @@ -95,4 +91,16 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_domconfiguration_can_set_parameter */ + +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domerror.c?r1=1.6.2.1.2.1.2.2&r2=1.6.2.1.2.1.2.3&diff_format=u Index: php-src/ext/dom/domerror.c diff -u php-src/ext/dom/domerror.c:1.6.2.1.2.1.2.2 php-src/ext/dom/domerror.c:1.6.2.1.2.1.2.3 --- php-src/ext/dom/domerror.c:1.6.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/domerror.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domerror.c,v 1.6.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: domerror.c,v 1.6.2.1.2.1.2.3 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -55,8 +55,6 @@ /* }}} */ - - /* {{{ message string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-message @@ -71,8 +69,6 @@ /* }}} */ - - /* {{{ type string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-type @@ -87,8 +83,6 @@ /* }}} */ - - /* {{{ relatedException object readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedException @@ -103,8 +97,6 @@ /* }}} */ - - /* {{{ relatedData domobject readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-relatedData @@ -119,8 +111,6 @@ /* }}} */ - - /* {{{ location domlocator readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-DOMError-location @@ -135,4 +125,15 @@ /* }}} */ +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domerrorhandler.c?r1=1.5.2.1.2.1.2.3&r2=1.5.2.1.2.1.2.4&diff_format=u Index: php-src/ext/dom/domerrorhandler.c diff -u php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1.2.3 php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1.2.4 --- php-src/ext/dom/domerrorhandler.c:1.5.2.1.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/domerrorhandler.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domerrorhandler.c,v 1.5.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: domerrorhandler.c,v 1.5.2.1.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_domerrorhandler_handle_error, 0, 0, 1) @@ -49,7 +48,6 @@ /* {{{ attribute protos, not implemented yet */ - /* {{{ proto dom_boolean dom_domerrorhandler_handle_error(domerror error); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-ERRORS-DOMErrorHandler-handleError Since: @@ -59,4 +57,16 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_domerrorhandler_handle_error */ + +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domexception.c?r1=1.11.2.1.2.1.2.2&r2=1.11.2.1.2.1.2.3&diff_format=u Index: php-src/ext/dom/domexception.c diff -u php-src/ext/dom/domexception.c:1.11.2.1.2.1.2.2 php-src/ext/dom/domexception.c:1.11.2.1.2.1.2.3 --- php-src/ext/dom/domexception.c:1.11.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/domexception.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domexception.c,v 1.11.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: domexception.c,v 1.11.2.1.2.1.2.3 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* * class DOMException * @@ -41,8 +40,7 @@ {NULL, NULL, NULL} }; -/* {{{ php_dom_throw_error_with_message */ -void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC) +void php_dom_throw_error_with_message(int error_code, char *error_message, int strict_error TSRMLS_DC) /* {{{ */ { if (strict_error == 1) { zend_throw_exception(dom_domexception_class_entry, error_message, error_code TSRMLS_CC); @@ -50,6 +48,7 @@ php_libxml_issue_error(E_WARNING, error_message TSRMLS_CC); } } +/* }}} */ /* {{{ php_dom_throw_error */ void php_dom_throw_error(int error_code, int strict_error TSRMLS_DC) @@ -115,3 +114,12 @@ /* }}} end php_dom_throw_error */ #endif /* HAVE_LIBXML && HAVE_DOM */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementation.c?r1=1.15.2.2.2.2.2.3&r2=1.15.2.2.2.2.2.4&diff_format=u Index: php-src/ext/dom/domimplementation.c diff -u php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.3 php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.4 --- php-src/ext/dom/domimplementation.c:1.15.2.2.2.2.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/domimplementation.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementation.c,v 1.15.2.2.2.2.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: domimplementation.c,v 1.15.2.2.2.2.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -89,7 +89,6 @@ } /* }}} end dom_domimplementation_has_feature */ - /* {{{ proto DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType Since: DOM Level 2 @@ -150,7 +149,6 @@ } /* }}} end dom_domimplementation_create_document_type */ - /* {{{ proto DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument Since: DOM Level 2 @@ -253,7 +251,6 @@ } /* }}} end dom_domimplementation_create_document */ - /* {{{ proto DOMNode dom_domimplementation_get_feature(string feature, string version); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature Since: DOM Level 3 @@ -263,4 +260,14 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_domimplementation_get_feature */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementationlist.c?r1=1.6.2.1.2.1.2.3&r2=1.6.2.1.2.1.2.4&diff_format=u Index: php-src/ext/dom/domimplementationlist.c diff -u php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1.2.3 php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1.2.4 --- php-src/ext/dom/domimplementationlist.c:1.6.2.1.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/domimplementationlist.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementationlist.c,v 1.6.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: domimplementationlist.c,v 1.6.2.1.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_implementationlist_item, 0, 0, 1) @@ -63,9 +62,6 @@ /* }}} */ - - - /* {{{ proto domdomimplementation dom_domimplementationlist_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-item Since: @@ -75,4 +71,16 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_domimplementationlist_item */ + +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domimplementationsource.c?r1=1.5.2.1.2.1.2.3&r2=1.5.2.1.2.1.2.4&diff_format=u Index: php-src/ext/dom/domimplementationsource.c diff -u php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1.2.3 php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1.2.4 --- php-src/ext/dom/domimplementationsource.c:1.5.2.1.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/domimplementationsource.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domimplementationsource.c,v 1.5.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: domimplementationsource.c,v 1.5.2.1.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -55,7 +55,6 @@ /* {{{ attribute protos, not implemented yet */ - /* {{{ proto domdomimplementation dom_domimplementationsource_get_domimplementation(string features); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpl Since: @@ -66,7 +65,6 @@ } /* }}} end dom_domimplementationsource_get_domimplementation */ - /* {{{ proto domimplementationlist dom_domimplementationsource_get_domimplementations(string features); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpls Since: @@ -76,4 +74,16 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_domimplementationsource_get_domimplementations */ + +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domlocator.c?r1=1.6.2.1.2.1.2.2&r2=1.6.2.1.2.1.2.3&diff_format=u Index: php-src/ext/dom/domlocator.c diff -u php-src/ext/dom/domlocator.c:1.6.2.1.2.1.2.2 php-src/ext/dom/domlocator.c:1.6.2.1.2.1.2.3 --- php-src/ext/dom/domlocator.c:1.6.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/domlocator.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domlocator.c,v 1.6.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: domlocator.c,v 1.6.2.1.2.1.2.3 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -55,8 +55,6 @@ /* }}} */ - - /* {{{ column_number long readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-column-number @@ -71,8 +69,6 @@ /* }}} */ - - /* {{{ offset long readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-offset @@ -87,8 +83,6 @@ /* }}} */ - - /* {{{ related_node node readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-node @@ -103,8 +97,6 @@ /* }}} */ - - /* {{{ uri string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMLocator-uri @@ -119,5 +111,15 @@ /* }}} */ +/* }}} */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/domstringlist.c?r1=1.6.2.1.2.1.2.3&r2=1.6.2.1.2.1.2.4&diff_format=u Index: php-src/ext/dom/domstringlist.c diff -u php-src/ext/dom/domstringlist.c:1.6.2.1.2.1.2.3 php-src/ext/dom/domstringlist.c:1.6.2.1.2.1.2.4 --- php-src/ext/dom/domstringlist.c:1.6.2.1.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/domstringlist.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: domstringlist.c,v 1.6.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: domstringlist.c,v 1.6.2.1.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_stringlist_item, 0, 0, 1) @@ -63,9 +62,6 @@ /* }}} */ - - - /* {{{ proto domstring dom_domstringlist_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-item Since: @@ -75,4 +71,16 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_domstringlist_item */ + +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/element.c?r1=1.36.2.4.2.8.2.6&r2=1.36.2.4.2.8.2.7&diff_format=u Index: php-src/ext/dom/element.c diff -u php-src/ext/dom/element.c:1.36.2.4.2.8.2.6 php-src/ext/dom/element.c:1.36.2.4.2.8.2.7 --- php-src/ext/dom/element.c:1.36.2.4.2.8.2.6 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/element.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: element.c,v 1.36.2.4.2.8.2.6 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: element.c,v 1.36.2.4.2.8.2.7 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_element_get_attribute, 0, 0, 1) @@ -146,7 +145,7 @@ * Since: */ -const zend_function_entry php_dom_element_class_functions[] = { +const zend_function_entry php_dom_element_class_functions[] = { /* {{{ */ PHP_FALIAS(getAttribute, dom_element_get_attribute, arginfo_dom_element_get_attribute) PHP_FALIAS(setAttribute, dom_element_set_attribute, arginfo_dom_element_set_attribute) PHP_FALIAS(removeAttribute, dom_element_remove_attribute, arginfo_dom_element_remove_attribute) @@ -168,6 +167,7 @@ PHP_ME(domelement, __construct, arginfo_dom_element_construct, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; +/* }}} */ /* {{{ proto void DOMElement::__construct(string name, [string value], [string uri]); */ PHP_METHOD(domelement, __construct) @@ -283,8 +283,6 @@ /* }}} */ - - /* {{{ schemaTypeInfo typeinfo readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Element-schemaTypeInfo @@ -299,7 +297,8 @@ /* }}} */ -static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) { +static xmlNodePtr dom_get_dom1_attribute(xmlNodePtr elem, xmlChar *name) /* {{{ */ +{ int len; const xmlChar *nqname; @@ -339,6 +338,7 @@ } return (xmlNodePtr)xmlHasNsProp(elem, name, NULL); } +/* }}} */ /* {{{ proto string dom_element_get_attribute(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9 @@ -383,7 +383,6 @@ } /* }}} end dom_element_get_attribute */ - /* {{{ proto void dom_element_set_attribute(string name, string value); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082 Since: @@ -450,7 +449,6 @@ } /* }}} end dom_element_set_attribute */ - /* {{{ proto void dom_element_remove_attribute(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9 Since: @@ -499,7 +497,6 @@ } /* }}} end dom_element_remove_attribute */ - /* {{{ proto DOMAttr dom_element_get_attribute_node(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8 Since: @@ -546,7 +543,6 @@ } /* }}} end dom_element_get_attribute_node */ - /* {{{ proto DOMAttr dom_element_set_attribute_node(DOMAttr newAttr); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154 Since: @@ -613,7 +609,6 @@ } /* }}} end dom_element_set_attribute_node */ - /* {{{ proto DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198 Since: @@ -651,7 +646,6 @@ } /* }}} end dom_element_remove_attribute_node */ - /* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D Since: @@ -678,7 +672,6 @@ } /* }}} end dom_element_get_elements_by_tag_name */ - /* {{{ proto string dom_element_get_attribute_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS Since: DOM Level 2 @@ -720,7 +713,8 @@ } /* }}} end dom_element_get_attribute_ns */ -static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) { +static xmlNsPtr _dom_new_reconNs(xmlDocPtr doc, xmlNodePtr tree, xmlNsPtr ns) /* {{{ */ +{ xmlNsPtr def; xmlChar prefix[50]; int counter = 1; @@ -756,6 +750,7 @@ def = xmlNewNs(tree, ns->href, prefix); return(def); } +/* }}} */ /* {{{ proto void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS @@ -874,7 +869,6 @@ } /* }}} end dom_element_set_attribute_ns */ - /* {{{ proto void dom_element_remove_attribute_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS Since: DOM Level 2 @@ -932,7 +926,6 @@ } /* }}} end dom_element_remove_attribute_ns */ - /* {{{ proto DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS Since: DOM Level 2 @@ -963,7 +956,6 @@ } /* }}} end dom_element_get_attribute_node_ns */ - /* {{{ proto DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS Since: DOM Level 2 @@ -1037,8 +1029,6 @@ } /* }}} end dom_element_set_attribute_node_ns */ - - /* {{{ proto DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942 Since: DOM Level 2 @@ -1067,7 +1057,6 @@ } /* }}} end dom_element_get_elements_by_tag_name_ns */ - /* {{{ proto boolean dom_element_has_attribute(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr Since: DOM Level 2 @@ -1096,7 +1085,6 @@ } /* }}} end dom_element_has_attribute */ - /* {{{ proto boolean dom_element_has_attribute_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS Since: DOM Level 2 @@ -1135,8 +1123,7 @@ } /* }}} end dom_element_has_attribute_ns */ - -static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id) +static void php_set_attribute_id(xmlAttrPtr attrp, zend_bool is_id) /* {{{ */ { if (is_id == 1 && attrp->atype != XML_ATTRIBUTE_ID) { xmlChar *id_val; @@ -1153,6 +1140,7 @@ } } } +/* }}} */ /* {{{ proto void dom_element_set_id_attribute(string name, boolean isId); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr @@ -1190,7 +1178,6 @@ } /* }}} end dom_element_set_id_attribute */ - /* {{{ proto void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS Since: DOM Level 3 @@ -1227,7 +1214,6 @@ } /* }}} end dom_element_set_id_attribute_ns */ - /* {{{ proto void dom_element_set_id_attribute_node(attr idAttr, boolean isId); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode Since: DOM Level 3 @@ -1264,3 +1250,12 @@ /* }}} end dom_element_set_id_attribute_node */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/entity.c?r1=1.9.2.1.2.1.2.2&r2=1.9.2.1.2.1.2.3&diff_format=u Index: php-src/ext/dom/entity.c diff -u php-src/ext/dom/entity.c:1.9.2.1.2.1.2.2 php-src/ext/dom/entity.c:1.9.2.1.2.1.2.3 --- php-src/ext/dom/entity.c:1.9.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/entity.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: entity.c,v 1.9.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: entity.c,v 1.9.2.1.2.1.2.3 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -67,8 +67,6 @@ /* }}} */ - - /* {{{ systemId string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-D7C29F3E @@ -97,8 +95,6 @@ /* }}} */ - - /* {{{ notationName string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-6ABAEB38 @@ -130,8 +126,6 @@ /* }}} */ - - /* {{{ actualEncoding string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-actualEncoding @@ -151,8 +145,6 @@ /* }}} */ - - /* {{{ encoding string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-encoding @@ -172,8 +164,6 @@ /* }}} */ - - /* {{{ version string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Entity3-version @@ -194,3 +184,12 @@ /* }}} */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/entityreference.c?r1=1.12.2.1.2.2.2.4&r2=1.12.2.1.2.2.2.5&diff_format=u Index: php-src/ext/dom/entityreference.c diff -u php-src/ext/dom/entityreference.c:1.12.2.1.2.2.2.4 php-src/ext/dom/entityreference.c:1.12.2.1.2.2.2.5 --- php-src/ext/dom/entityreference.c:1.12.2.1.2.2.2.4 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/entityreference.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: entityreference.c,v 1.12.2.1.2.2.2.4 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: entityreference.c,v 1.12.2.1.2.2.2.5 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_entityreference_construct, 0, 0, 1) @@ -87,6 +86,15 @@ php_libxml_increment_node_ptr((php_libxml_node_object *)intern, node, (void *)intern TSRMLS_CC); } } - /* }}} end DOMEntityReference::__construct */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/namednodemap.c?r1=1.15.2.2.2.1.2.3&r2=1.15.2.2.2.1.2.4&diff_format=u Index: php-src/ext/dom/namednodemap.c diff -u php-src/ext/dom/namednodemap.c:1.15.2.2.2.1.2.3 php-src/ext/dom/namednodemap.c:1.15.2.2.2.1.2.4 --- php-src/ext/dom/namednodemap.c:1.15.2.2.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/namednodemap.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: namednodemap.c,v 1.15.2.2.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: namednodemap.c,v 1.15.2.2.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namednodemap_get_named_item, 0, 0, 1) @@ -74,7 +73,7 @@ * Since: */ -const zend_function_entry php_dom_namednodemap_class_functions[] = { +const zend_function_entry php_dom_namednodemap_class_functions[] = { /* {{{ */ PHP_FALIAS(getNamedItem, dom_namednodemap_get_named_item, arginfo_dom_namednodemap_get_named_item) PHP_FALIAS(setNamedItem, dom_namednodemap_set_named_item, arginfo_dom_namednodemap_set_named_item) PHP_FALIAS(removeNamedItem, dom_namednodemap_remove_named_item, arginfo_dom_namednodemap_remove_named_item) @@ -84,6 +83,7 @@ PHP_FALIAS(removeNamedItemNS, dom_namednodemap_remove_named_item_ns, arginfo_dom_namednodemap_remove_named_item_ns) {NULL, NULL, NULL} }; +/* }}} */ /* {{{ length int readonly=yes @@ -127,9 +127,6 @@ /* }}} */ - - - /* {{{ proto DOMNode dom_namednodemap_get_named_item(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549 Since: @@ -184,7 +181,6 @@ } /* }}} end dom_namednodemap_get_named_item */ - /* {{{ proto DOMNode dom_namednodemap_set_named_item(DOMNode arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788 Since: @@ -195,7 +191,6 @@ } /* }}} end dom_namednodemap_set_named_item */ - /* {{{ proto DOMNode dom_namednodemap_remove_named_item(string name); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193 Since: @@ -206,7 +201,6 @@ } /* }}} end dom_namednodemap_remove_named_item */ - /* {{{ proto DOMNode dom_namednodemap_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9 Since: @@ -265,7 +259,6 @@ } /* }}} end dom_namednodemap_item */ - /* {{{ proto DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS Since: DOM Level 2 @@ -320,7 +313,6 @@ } /* }}} end dom_namednodemap_get_named_item_ns */ - /* {{{ proto DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS Since: DOM Level 2 @@ -331,7 +323,6 @@ } /* }}} end dom_namednodemap_set_named_item_ns */ - /* {{{ proto DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS Since: DOM Level 2 @@ -341,4 +332,14 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_namednodemap_remove_named_item_ns */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/namelist.c?r1=1.7.2.1.2.1.2.3&r2=1.7.2.1.2.1.2.4&diff_format=u Index: php-src/ext/dom/namelist.c diff -u php-src/ext/dom/namelist.c:1.7.2.1.2.1.2.3 php-src/ext/dom/namelist.c:1.7.2.1.2.1.2.4 --- php-src/ext/dom/namelist.c:1.7.2.1.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/namelist.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: namelist.c,v 1.7.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: namelist.c,v 1.7.2.1.2.1.2.4 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_namelist_get_name, 0, 0, 1) @@ -67,9 +66,6 @@ /* }}} */ - - - /* {{{ proto string dom_namelist_get_name(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getName Since: @@ -80,7 +76,6 @@ } /* }}} end dom_namelist_get_name */ - /* {{{ proto string dom_namelist_get_namespace_uri(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getNamespaceURI Since: @@ -90,4 +85,14 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_namelist_get_namespace_uri */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/node.c?r1=1.37.2.3.2.8.2.5&r2=1.37.2.3.2.8.2.6&diff_format=u Index: php-src/ext/dom/node.c diff -u php-src/ext/dom/node.c:1.37.2.3.2.8.2.5 php-src/ext/dom/node.c:1.37.2.3.2.8.2.6 --- php-src/ext/dom/node.c:1.37.2.3.2.8.2.5 Wed Jan 30 06:48:13 2008 +++ php-src/ext/dom/node.c Thu Aug 14 08:39:04 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: node.c,v 1.37.2.3.2.8.2.5 2008/01/30 06:48:13 sebastian Exp $ */ +/* $Id: node.c,v 1.37.2.3.2.8.2.6 2008/08/14 08:39:04 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -150,7 +150,7 @@ * Since: */ -const zend_function_entry php_dom_node_class_functions[] = { +const zend_function_entry php_dom_node_class_functions[] = { /* {{{ */ PHP_FALIAS(insertBefore, dom_node_insert_before, arginfo_dom_node_insert_before) PHP_FALIAS(replaceChild, dom_node_replace_child, arginfo_dom_node_replace_child) PHP_FALIAS(removeChild, dom_node_remove_child, arginfo_dom_node_remove_child) @@ -174,8 +174,10 @@ PHP_ME(domnode, C14NFile, arginfo_dom_node_C14NFile, ZEND_ACC_PUBLIC) {NULL, NULL, NULL} }; +/* }}} */ -static void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) { +static void dom_reconcile_ns(xmlDocPtr doc, xmlNodePtr nodep) /* {{{ */ +{ xmlNsPtr nsptr; if (nodep->type == XML_ELEMENT_NODE) { @@ -190,6 +192,7 @@ xmlReconciliateNs(doc, nodep); } } +/* }}} */ /* {{{ nodeName string readonly=yes @@ -281,8 +284,6 @@ /* }}} */ - - /* {{{ nodeValue string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68D080 @@ -377,8 +378,6 @@ /* }}} */ - - /* {{{ nodeType int readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-111237558 @@ -409,8 +408,6 @@ /* }}} */ - - /* {{{ parentNode DomNode readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1060184317 @@ -444,8 +441,6 @@ /* }}} */ - - /* {{{ childNodes DomNodeList readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1451460987 @@ -478,8 +473,6 @@ /* }}} */ - - /* {{{ firstChild DomNode readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-169727388 @@ -516,8 +509,6 @@ /* }}} */ - - /* {{{ lastChild DomNode readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-61AD09FB @@ -554,8 +545,6 @@ /* }}} */ - - /* {{{ previousSibling DomNode readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-640FB3C8 @@ -589,8 +578,6 @@ /* }}} */ - - /* {{{ nextSibling DomNode readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6AC54C2F @@ -624,8 +611,6 @@ /* }}} */ - - /* {{{ attributes DomNamedNodeMap readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-84CF096 @@ -658,8 +643,6 @@ /* }}} */ - - /* {{{ ownerDocument DomDocument readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-node-ownerDoc @@ -700,8 +683,6 @@ /* }}} */ - - /* {{{ namespaceUri string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSname @@ -745,8 +726,6 @@ /* }}} */ - - /* {{{ prefix string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSPrefix @@ -869,8 +848,6 @@ /* }}} */ - - /* {{{ localName string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeNSLocalN @@ -900,8 +877,6 @@ /* }}} */ - - /* {{{ baseURI string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-baseURI @@ -934,8 +909,6 @@ /* }}} */ - - /* {{{ textContent string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-textContent @@ -974,10 +947,7 @@ /* }}} */ - -static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, - xmlNodePtr nextsib, xmlNodePtr fragment, - dom_object *intern, dom_object *childobj TSRMLS_DC) +static xmlNodePtr _php_dom_insert_fragment(xmlNodePtr nodep, xmlNodePtr prevsib, xmlNodePtr nextsib, xmlNodePtr fragment, dom_object *intern, dom_object *childobj TSRMLS_DC) /* {{{ */ { xmlNodePtr newchild, node; @@ -1020,6 +990,7 @@ return newchild; } +/* }}} */ /* {{{ proto domnode dom_node_insert_before(DomNode newChild, DomNode refChild); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727 @@ -1182,7 +1153,6 @@ } /* }}} end dom_node_insert_before */ - /* {{{ proto DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307 Since: @@ -1274,7 +1244,6 @@ } /* }}} end dom_node_replace_child */ - /* {{{ proto DomNode dom_node_remove_child(DomNode oldChild); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066 Since: @@ -1327,7 +1296,6 @@ } /* }}} end dom_node_remove_child */ - /* {{{ proto DomNode dom_node_append_child(DomNode newChild); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107 Since: @@ -1429,7 +1397,6 @@ } /* }}} end dom_node_append_child */ - /* {{{ proto boolean dom_node_has_child_nodes(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187 Since: @@ -1458,7 +1425,6 @@ } /* }}} end dom_node_has_child_nodes */ - /* {{{ proto DomNode dom_node_clone_node(boolean deep); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4 Since: @@ -1521,8 +1487,6 @@ } /* }}} end dom_node_clone_node */ - - /* {{{ proto void dom_node_normalize(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize Since: @@ -1544,7 +1508,6 @@ } /* }}} end dom_node_normalize */ - /* {{{ proto boolean dom_node_is_supported(string feature, string version); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports Since: DOM Level 2 @@ -1567,7 +1530,6 @@ } /* }}} end dom_node_is_supported */ - /* {{{ proto boolean dom_node_has_attributes(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs Since: DOM Level 2 @@ -1605,7 +1567,6 @@ } /* }}} end dom_node_compare_document_position */ - /* {{{ proto boolean dom_node_is_same_node(DomNode other); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode Since: DOM Level 3 @@ -1632,7 +1593,6 @@ } /* }}} end dom_node_is_same_node */ - /* {{{ proto string dom_node_lookup_prefix(string namespaceURI); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix Since: DOM Level 3 @@ -1683,7 +1643,6 @@ } /* }}} end dom_node_lookup_prefix */ - /* {{{ proto boolean dom_node_is_default_namespace(string namespaceURI); URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace Since: DOM Level 3 @@ -1717,7 +1676,6 @@ } /* }}} end dom_node_is_default_namespace */ - /* {{{ proto string dom_node_lookup_namespace_uri(string prefix); URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI Since: DOM Level 3 @@ -1752,7 +1710,6 @@ } /* }}} end dom_node_lookup_namespace_uri */ - /* {{{ proto boolean dom_node_is_equal_node(DomNode arg); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode Since: DOM Level 3 @@ -1763,7 +1720,6 @@ } /* }}} end dom_node_is_equal_node */ - /* {{{ proto DomNode dom_node_get_feature(string feature, string version); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature Since: DOM Level 3 @@ -1774,7 +1730,6 @@ } /* }}} end dom_node_get_feature */ - /* {{{ proto DomUserData dom_node_set_user_data(string key, DomUserData data, userdatahandler handler); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData Since: DOM Level 3 @@ -1785,7 +1740,6 @@ } /* }}} end dom_node_set_user_data */ - /* {{{ proto DomUserData dom_node_get_user_data(string key); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData Since: DOM Level 3 @@ -1796,8 +1750,7 @@ } /* }}} end dom_node_get_user_data */ - -static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) +static void dom_canonicalization(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */ { zval *id; zval *xpath_array=NULL, *ns_prefixes=NULL; @@ -1965,6 +1918,7 @@ } } } +/* }}} */ /* {{{ proto string DOMNode::C14N([bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) Canonicalize nodes to a string */ @@ -1972,6 +1926,7 @@ { dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0); } +/* }}} */ /* {{{ proto int DOMNode::C14NFile(string uri [, bool exclusive [, bool with_comments [, array xpath [, array ns_prefixes]]]]) Canonicalize nodes to a file */ @@ -1979,12 +1934,10 @@ { dom_canonicalization(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1); } - -#endif +/* }}} */ /* {{{ proto int DOMNode::getNodePath() Gets an xpath for a node */ - PHP_METHOD(domnode, getNodePath) { zval *id; @@ -1992,8 +1945,6 @@ dom_object *intern; char *value; - - DOM_GET_THIS_OBJ(nodep, id, xmlNodePtr, intern); value = xmlGetNodePath(nodep); @@ -2003,7 +1954,16 @@ RETVAL_STRING(value, 1); xmlFree(value); } - - } +/* }}} */ + +#endif +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/nodelist.c?r1=1.17.2.2.2.2.2.3&r2=1.17.2.2.2.2.2.4&diff_format=u Index: php-src/ext/dom/nodelist.c diff -u php-src/ext/dom/nodelist.c:1.17.2.2.2.2.2.3 php-src/ext/dom/nodelist.c:1.17.2.2.2.2.2.4 --- php-src/ext/dom/nodelist.c:1.17.2.2.2.2.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/nodelist.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: nodelist.c,v 1.17.2.2.2.2.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: nodelist.c,v 1.17.2.2.2.2.2.4 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -99,7 +99,6 @@ /* }}} */ - /* {{{ proto DOMNode dom_nodelist_item(int index); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136 Since: @@ -173,4 +172,14 @@ RETVAL_NULL(); } /* }}} end dom_nodelist_item */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/notation.c?r1=1.9.2.2.2.1.2.2&r2=1.9.2.2.2.1.2.3&diff_format=u Index: php-src/ext/dom/notation.c diff -u php-src/ext/dom/notation.c:1.9.2.2.2.1.2.2 php-src/ext/dom/notation.c:1.9.2.2.2.1.2.3 --- php-src/ext/dom/notation.c:1.9.2.2.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/notation.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: notation.c,v 1.9.2.2.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: notation.c,v 1.9.2.2.2.1.2.3 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* * class DOMNotation extends DOMNode * @@ -69,8 +68,6 @@ /* }}} */ - - /* {{{ systemId string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-E8AAB1D0 @@ -99,4 +96,15 @@ /* }}} */ +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.c?r1=1.73.2.12.2.12.2.6&r2=1.73.2.12.2.12.2.7&diff_format=u Index: php-src/ext/dom/php_dom.c diff -u php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.6 php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.7 --- php-src/ext/dom/php_dom.c:1.73.2.12.2.12.2.6 Fri Jun 27 19:16:17 2008 +++ php-src/ext/dom/php_dom.c Thu Aug 14 08:39:05 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.c,v 1.73.2.12.2.12.2.6 2008/06/27 19:16:17 felipe Exp $ */ +/* $Id: php_dom.c,v 1.73.2.12.2.12.2.7 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -34,6 +34,7 @@ #define PHP_XPATH 1 #define PHP_XPTR 2 +/* {{{ class entries */ zend_class_entry *dom_node_class_entry; zend_class_entry *dom_domexception_class_entry; zend_class_entry *dom_domstringlist_class_entry; @@ -67,11 +68,12 @@ zend_class_entry *dom_xpath_class_entry; #endif zend_class_entry *dom_namespace_node_class_entry; +/* }}} */ zend_object_handlers dom_object_handlers; static HashTable classes; - +/* {{{ prop handler tables */ static HashTable dom_domstringlist_prop_handlers; static HashTable dom_namelist_prop_handlers; static HashTable dom_domimplementationlist_prop_handlers; @@ -94,6 +96,7 @@ #if defined(LIBXML_XPATH_ENABLED) static HashTable dom_xpath_prop_handlers; #endif +/* }}} */ typedef int (*dom_read_t)(dom_object *obj, zval **retval TSRMLS_DC); typedef int (*dom_write_t)(dom_object *obj, zval *newval TSRMLS_DC); @@ -274,7 +277,7 @@ } /* }}} */ -static zval **dom_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) +static zval **dom_get_property_ptr_ptr(zval *object, zval *member TSRMLS_DC) /* {{{ */ { dom_object *obj; zval tmp_member; @@ -305,6 +308,7 @@ } return retval; } +/* }}} */ /* {{{ dom_read_property */ zval *dom_read_property(zval *object, zval *member, int type TSRMLS_DC) @@ -436,7 +440,7 @@ } /* }}} */ -void *php_dom_export_node(zval *object TSRMLS_DC) +void *php_dom_export_node(zval *object TSRMLS_DC) /* {{{ */ { php_libxml_node_object *intern; xmlNodePtr nodep = NULL; @@ -448,6 +452,7 @@ return nodep; } +/* }}} */ /* {{{ proto somNode dom_import_simplexml(sxeobject node) Get a simplexml_element object from dom to allow for processing */ @@ -475,7 +480,7 @@ } /* }}} */ -zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC) +zend_object_value dom_objects_store_clone_obj(zval *zobject TSRMLS_DC) /* {{{ */ { zend_object_value retval; void *new_object; @@ -502,6 +507,7 @@ return retval; } +/* }}} */ /* {{{ arginfo */ static @@ -525,7 +531,7 @@ {NULL, NULL, NULL} }; -zend_module_entry dom_module_entry = { +zend_module_entry dom_module_entry = { /* {{{ */ STANDARD_MODULE_HEADER_EX, NULL, dom_deps, "dom", @@ -538,6 +544,7 @@ DOM_API_VERSION, /* Extension versionnumber */ STANDARD_MODULE_PROPERTIES }; +/* }}} */ #ifdef COMPILE_DL_DOM ZEND_GET_MODULE(dom) @@ -874,7 +881,7 @@ } /* }}} */ -PHP_MSHUTDOWN_FUNCTION(dom) +PHP_MSHUTDOWN_FUNCTION(dom) /* {{{ */ { zend_hash_destroy(&dom_domstringlist_prop_handlers); zend_hash_destroy(&dom_namelist_prop_handlers); @@ -907,6 +914,7 @@ return SUCCESS; } +/* }}} */ /* {{{ node_list_unlink */ void node_list_unlink(xmlNodePtr node TSRMLS_DC) @@ -992,7 +1000,7 @@ } /* }}} */ -void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns TSRMLS_DC) +void dom_namednode_iter(dom_object *basenode, int ntype, dom_object *intern, xmlHashTablePtr ht, xmlChar *local, xmlChar *ns TSRMLS_DC) /* {{{ */ { dom_nnodemap_object *mapptr; zval *baseobj = NULL; @@ -1014,8 +1022,9 @@ mapptr->ns = ns; } +/* }}} */ -static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy TSRMLS_DC) +static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool hash_copy TSRMLS_DC) /* {{{ */ { zend_class_entry *base_class; zval *tmp; @@ -1045,6 +1054,7 @@ return intern; } +/* }}} */ /* {{{ dom_objects_clone */ void dom_objects_clone(void *object, void **object_clone TSRMLS_DC) @@ -1116,7 +1126,7 @@ /* }}} */ #endif -static void dom_nnodemap_object_dtor(void *object, zend_object_handle handle TSRMLS_DC) +static void dom_nnodemap_object_dtor(void *object, zend_object_handle handle TSRMLS_DC) /* {{{ */ { zval *baseobj; dom_object *intern; @@ -1142,8 +1152,9 @@ } +/* }}} */ -void dom_nnodemap_objects_free_storage(void *object TSRMLS_DC) +void dom_nnodemap_objects_free_storage(void *object TSRMLS_DC) /* {{{ */ { dom_object *intern = (dom_object *)object; @@ -1153,8 +1164,9 @@ efree(object); } +/* }}} */ -zend_object_value dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC) +zend_object_value dom_nnodemap_objects_new(zend_class_entry *class_type TSRMLS_DC) /* {{{ */ { zend_object_value retval; dom_object *intern; @@ -1176,8 +1188,9 @@ return retval; } +/* }}} */ -void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC) +void php_dom_create_interator(zval *return_value, int ce_type TSRMLS_DC) /* {{{ */ { zend_class_entry *ce; @@ -1189,6 +1202,7 @@ object_init_ex(return_value, ce); } +/* }}} */ /* {{{ php_dom_create_object */ PHP_DOM_EXPORT zval *php_dom_create_object(xmlNodePtr obj, int *found, zval *wrapper_in, zval *return_value, dom_object *domobj TSRMLS_DC) @@ -1310,7 +1324,6 @@ } /* }}} end php_domobject_new */ - void php_dom_create_implementation(zval **retval TSRMLS_DC) { object_init_ex(*retval, dom_domimplementation_class_entry); } @@ -1351,7 +1364,7 @@ } /* }}} end dom_has_feature */ -xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index) +xmlNode *dom_get_elements_by_tag_name_ns_raw(xmlNodePtr nodep, char *ns, char *local, int *cur, int index) /* {{{ */ { xmlNodePtr ret = NULL; @@ -1375,9 +1388,9 @@ } return ret; } +/* }}} */ /* }}} end dom_element_get_elements_by_tag_name_ns_raw */ - /* {{{ void dom_normalize (xmlNodePtr nodep TSRMLS_DC) */ void dom_normalize (xmlNodePtr nodep TSRMLS_DC) { @@ -1485,7 +1498,7 @@ return 0; } - +/* }}} */ /* http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/core.html#ID-DocCrElNS http://cvs.php.net/viewvc.cgi/php-src/ext/dom/php_dom.h?r1=1.28.2.1.2.4.2.3&r2=1.28.2.1.2.4.2.4&diff_format=u Index: php-src/ext/dom/php_dom.h diff -u php-src/ext/dom/php_dom.h:1.28.2.1.2.4.2.3 php-src/ext/dom/php_dom.h:1.28.2.1.2.4.2.4 --- php-src/ext/dom/php_dom.h:1.28.2.1.2.4.2.3 Mon Mar 10 22:12:33 2008 +++ php-src/ext/dom/php_dom.h Thu Aug 14 08:39:05 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_dom.h,v 1.28.2.1.2.4.2.3 2008/03/10 22:12:33 felipe Exp $ */ +/* $Id: php_dom.h,v 1.28.2.1.2.4.2.4 2008/08/14 08:39:05 tony2001 Exp $ */ #ifndef PHP_DOM_H #define PHP_DOM_H @@ -154,3 +154,12 @@ PHP_MINFO_FUNCTION(dom); #endif /* PHP_DOM_H */ + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/processinginstruction.c?r1=1.17.2.1.2.1.2.5&r2=1.17.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/processinginstruction.c diff -u php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.5 php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.6 --- php-src/ext/dom/processinginstruction.c:1.17.2.1.2.1.2.5 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/processinginstruction.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.5 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: processinginstruction.c,v 1.17.2.1.2.1.2.6 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -114,8 +114,6 @@ /* }}} */ - - /* {{{ data string readonly=no URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-837822393 @@ -179,3 +177,12 @@ /* }}} */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/string_extend.c?r1=1.5.2.1.2.1.2.3&r2=1.5.2.1.2.1.2.4&diff_format=u Index: php-src/ext/dom/string_extend.c diff -u php-src/ext/dom/string_extend.c:1.5.2.1.2.1.2.3 php-src/ext/dom/string_extend.c:1.5.2.1.2.1.2.4 --- php-src/ext/dom/string_extend.c:1.5.2.1.2.1.2.3 Mon Feb 4 15:22:59 2008 +++ php-src/ext/dom/string_extend.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string_extend.c,v 1.5.2.1.2.1.2.3 2008/02/04 15:22:59 sebastian Exp $ */ +/* $Id: string_extend.c,v 1.5.2.1.2.1.2.4 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,7 +27,6 @@ #if HAVE_LIBXML && HAVE_DOM #include "php_dom.h" - /* {{{ arginfo */ static ZEND_BEGIN_ARG_INFO_EX(arginfo_dom_string_extend_find_offset16, 0, 0, 1) @@ -55,7 +54,6 @@ /* {{{ attribute protos, not implemented yet */ - /* {{{ proto int dom_string_extend_find_offset16(int offset32); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset16 Since: @@ -66,7 +64,6 @@ } /* }}} end dom_string_extend_find_offset16 */ - /* {{{ proto int dom_string_extend_find_offset32(int offset16); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset32 Since: @@ -76,4 +73,16 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_string_extend_find_offset32 */ + +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/text.c?r1=1.23.2.1.2.4.2.4&r2=1.23.2.1.2.4.2.5&diff_format=u Index: php-src/ext/dom/text.c diff -u php-src/ext/dom/text.c:1.23.2.1.2.4.2.4 php-src/ext/dom/text.c:1.23.2.1.2.4.2.5 --- php-src/ext/dom/text.c:1.23.2.1.2.4.2.4 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/text.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: text.c,v 1.23.2.1.2.4.2.4 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: text.c,v 1.23.2.1.2.4.2.5 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -141,7 +141,6 @@ /* }}} */ - /* {{{ proto DOMText dom_text_split_text(int offset); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D Since: @@ -204,7 +203,6 @@ } /* }}} end dom_text_split_text */ - /* {{{ proto boolean dom_text_is_whitespace_in_element_content(); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent Since: DOM Level 3 @@ -228,7 +226,6 @@ } /* }}} end dom_text_is_whitespace_in_element_content */ - /* {{{ proto DOMText dom_text_replace_whole_text(string content); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-replaceWholeText Since: DOM Level 3 @@ -238,4 +235,14 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_text_replace_whole_text */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/typeinfo.c?r1=1.6.2.1.2.1.2.2&r2=1.6.2.1.2.1.2.3&diff_format=u Index: php-src/ext/dom/typeinfo.c diff -u php-src/ext/dom/typeinfo.c:1.6.2.1.2.1.2.2 php-src/ext/dom/typeinfo.c:1.6.2.1.2.1.2.3 --- php-src/ext/dom/typeinfo.c:1.6.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/typeinfo.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: typeinfo.c,v 1.6.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: typeinfo.c,v 1.6.2.1.2.1.2.3 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -55,8 +55,6 @@ /* }}} */ - - /* {{{ type_namespace string readonly=yes URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#TypeInfo-typeNamespace @@ -71,4 +69,15 @@ /* }}} */ +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/userdatahandler.c?r1=1.6.2.1.2.1.2.2&r2=1.6.2.1.2.1.2.3&diff_format=u Index: php-src/ext/dom/userdatahandler.c diff -u php-src/ext/dom/userdatahandler.c:1.6.2.1.2.1.2.2 php-src/ext/dom/userdatahandler.c:1.6.2.1.2.1.2.3 --- php-src/ext/dom/userdatahandler.c:1.6.2.1.2.1.2.2 Mon Dec 31 07:17:07 2007 +++ php-src/ext/dom/userdatahandler.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: userdatahandler.c,v 1.6.2.1.2.1.2.2 2007/12/31 07:17:07 sebastian Exp $ */ +/* $Id: userdatahandler.c,v 1.6.2.1.2.1.2.3 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -42,7 +42,6 @@ /* {{{ attribute protos, not implemented yet */ - /* {{{ proto dom_void dom_userdatahandler_handle(short operation, string key, domobject data, node src, node dst); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-handleUserDataEvent Since: @@ -52,4 +51,16 @@ DOM_NOT_IMPLEMENTED(); } /* }}} end dom_userdatahandler_handle */ + +/* }}} */ + #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xml_common.h?r1=1.23.2.1.2.2.2.2&r2=1.23.2.1.2.2.2.3&diff_format=u Index: php-src/ext/dom/xml_common.h diff -u php-src/ext/dom/xml_common.h:1.23.2.1.2.2.2.2 php-src/ext/dom/xml_common.h:1.23.2.1.2.2.2.3 --- php-src/ext/dom/xml_common.h:1.23.2.1.2.2.2.2 Wed Jan 30 09:41:12 2008 +++ php-src/ext/dom/xml_common.h Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xml_common.h,v 1.23.2.1.2.2.2.2 2008/01/30 09:41:12 dmitry Exp $ */ +/* $Id: xml_common.h,v 1.23.2.1.2.2.2.3 2008/08/14 08:39:05 tony2001 Exp $ */ #ifndef PHP_XML_COMMON_H #define PHP_XML_COMMON_H @@ -95,3 +95,12 @@ DOM_GET_OBJ(__ptr, __id, __prtype, __intern); #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */ http://cvs.php.net/viewvc.cgi/php-src/ext/dom/xpath.c?r1=1.26.2.1.2.1.2.5&r2=1.26.2.1.2.1.2.6&diff_format=u Index: php-src/ext/dom/xpath.c diff -u php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.5 php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.6 --- php-src/ext/dom/xpath.c:1.26.2.1.2.1.2.5 Fri Aug 8 22:07:07 2008 +++ php-src/ext/dom/xpath.c Thu Aug 14 08:39:05 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xpath.c,v 1.26.2.1.2.1.2.5 2008/08/08 22:07:07 colder Exp $ */ +/* $Id: xpath.c,v 1.26.2.1.2.1.2.6 2008/08/14 08:39:05 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -75,7 +75,7 @@ }; -static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) +static void dom_xpath_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int type) /* {{{ */ { zval **args; zval *retval; @@ -256,16 +256,19 @@ efree(fci.params); } } +/* }}} */ -static void dom_xpath_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) +static void dom_xpath_ext_function_string_php(xmlXPathParserContextPtr ctxt, int nargs) /* {{{ */ { dom_xpath_ext_function_php(ctxt, nargs, 1); } +/* }}} */ -static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) +static void dom_xpath_ext_function_object_php(xmlXPathParserContextPtr ctxt, int nargs) /* {{{ */ { dom_xpath_ext_function_php(ctxt, nargs, 2); } +/* }}} */ /* {{{ proto void DOMXPath::__construct(DOMDocument doc) U */ PHP_METHOD(domxpath, __construct) @@ -334,6 +337,7 @@ } return SUCCESS; } +/* }}} */ /* {{{ proto boolean dom_xpath_register_ns(string prefix, string uri); */ PHP_FUNCTION(dom_xpath_register_ns) @@ -361,8 +365,9 @@ } RETURN_TRUE; } +/* }}} */ -static void dom_xpath_iter(zval *baseobj, dom_object *intern) +static void dom_xpath_iter(zval *baseobj, dom_object *intern) /* {{{ */ { dom_nnodemap_object *mapptr; @@ -371,8 +376,10 @@ mapptr->nodetype = DOM_NODESET; } +/* }}} */ -static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) { +static void php_xpath_eval(INTERNAL_FUNCTION_PARAMETERS, int type) /* {{{ */ +{ zval *id, *retval, *context = NULL; xmlXPathContextPtr ctxp; xmlNodePtr nodep = NULL; @@ -513,6 +520,7 @@ xmlXPathFreeObject(xpathobjp); } +/* }}} */ /* {{{ proto DOMNodeList dom_xpath_query(string expr [,DOMNode context]); */ PHP_FUNCTION(dom_xpath_query) @@ -574,5 +582,13 @@ #endif /* LIBXML_XPATH_ENABLED */ -/* }}} */ #endif + +/* + * Local variables: + * tab-width: 4 + * c-basic-offset: 4 + * End: + * vim600: noet sw=4 ts=4 fdm=marker + * vim<600: noet sw=4 ts=4 + */