diff --git a/ixml/inc/ixml.h b/ixml/inc/ixml.h index ea72170..d9d1325 100644 --- a/ixml/inc/ixml.h +++ b/ixml/inc/ixml.h @@ -77,7 +77,11 @@ typedef int BOOL; -#define DOMString char * +/*! + * \brief The type of DOM strings. + */ +#define DOMString char * +/*typedef char *DOMString;*/ #ifndef TRUE @@ -1177,11 +1181,11 @@ EXPORT_SPEC const DOMString ixmlElement_getAttribute( * to complete the operation. */ EXPORT_SPEC int ixmlElement_setAttribute( - /*! The \b Element on which to set the attribute. */ + /*! [in] The \b Element on which to set the attribute. */ IXML_Element *element, - /*! The name of the attribute. */ + /*! [in] The name of the attribute. */ const DOMString name, - /*! The value of the attribute. Note that this is a non-parsed string + /*! [in] The value of the attribute. Note that this is a non-parsed string * and any markup must be escaped. */ const DOMString value); @@ -1195,9 +1199,9 @@ EXPORT_SPEC int ixmlElement_setAttribute( * \b name is \c NULL. */ EXPORT_SPEC int ixmlElement_removeAttribute( - /*! The \b Element from which to remove the attribute. */ + /*! [in] The \b Element from which to remove the attribute. */ IXML_Element *element, - /*! The name of the attribute to remove. */ + /*! [in] The name of the attribute to remove. */ const DOMString name); @@ -1209,9 +1213,9 @@ EXPORT_SPEC int ixmlElement_removeAttribute( * \return A pointer to the attribute matching \b name or \c NULL on an error. */ EXPORT_SPEC IXML_Attr *ixmlElement_getAttributeNode( - /*! The \b Element from which to get the attribute node. */ + /*! [in] The \b Element from which to get the attribute node. */ IXML_Element *element, - /*! The name of the attribute node to find. */ + /*! [in] The name of the attribute node to find. */ const DOMString name); @@ -1265,9 +1269,9 @@ EXPORT_SPEC int ixmlElement_removeAttributeNode( * \return A \b NodeList of the matching \b Elements or \c NULL on an error. */ EXPORT_SPEC IXML_NodeList *ixmlElement_getElementsByTagName( - /*! The \b Element from which to start the search. */ + /*! [in] The \b Element from which to start the search. */ IXML_Element *element, - /*! The name of the tag for which to search. */ + /*! [in] The name of the tag for which to search. */ const DOMString tagName); @@ -1465,9 +1469,9 @@ EXPORT_SPEC unsigned long ixmlNamedNodeMap_getLength( * \return A \b Node or \c NULL if there is an error. */ EXPORT_SPEC IXML_Node *ixmlNamedNodeMap_getNamedItem( - /*! The \b NamedNodeMap to search. */ + /*! [in] The \b NamedNodeMap to search. */ IXML_NamedNodeMap *nnMap, - /*! The name of the \b Node to find. */ + /*! [in] The name of the \b Node to find. */ const DOMString name); diff --git a/ixml/src/document.c b/ixml/src/document.c index aa089d8..64defb7 100644 --- a/ixml/src/document.c +++ b/ixml/src/document.c @@ -30,6 +30,11 @@ ******************************************************************************/ +/*! + * \file + */ + + #include <stdio.h> #include <stdlib.h> @@ -38,11 +43,6 @@ #include "ixmlparser.h" -/*! - * \file - */ - - void ixmlDocument_init(IXML_Document *doc) { memset(doc, 0, sizeof(IXML_Document)); @@ -211,7 +211,7 @@ IXML_Document *ixmlDocument_createDocument() int ixmlDocument_createTextNodeEx( IXML_Document *doc, - const char *data, + const DOMString data, IXML_Node **textNode) { IXML_Node *returnNode; @@ -260,7 +260,7 @@ ErrorHandler: IXML_Node *ixmlDocument_createTextNode( IXML_Document *doc, - const char *data) + const DOMString data) { IXML_Node *returnNode = NULL; @@ -504,7 +504,7 @@ IXML_Element *ixmlDocument_createElementNS( IXML_NodeList *ixmlDocument_getElementsByTagName( IXML_Document *doc, - const char *tagName) + const DOMString tagName) { IXML_NodeList *returnNodeList = NULL; diff --git a/ixml/src/element.c b/ixml/src/element.c index 524d9b6..2a83a6c 100644 --- a/ixml/src/element.c +++ b/ixml/src/element.c @@ -141,9 +141,9 @@ ixmlElement_getAttribute( IN IXML_Element * element, * *=================================================================*/ int -ixmlElement_setAttribute( IN IXML_Element * element, - IN const char *name, - IN const char *value ) +ixmlElement_setAttribute(IXML_Element *element, + const DOMString name, + const DOMString value) { IXML_Node *attrNode; IXML_Attr *newAttrNode; @@ -220,8 +220,8 @@ ixmlElement_setAttribute( IN IXML_Element * element, * *=================================================================*/ int -ixmlElement_removeAttribute( IN IXML_Element * element, - IN const char *name ) +ixmlElement_removeAttribute(IXML_Element *element, + const DOMString name) { IXML_Node *attrNode; @@ -261,8 +261,8 @@ ixmlElement_removeAttribute( IN IXML_Element * element, * *=================================================================*/ IXML_Attr * -ixmlElement_getAttributeNode( IN IXML_Element * element, - IN const char *name ) +ixmlElement_getAttributeNode(IXML_Element *element, + const DOMString name) { IXML_Node *attrNode; @@ -482,8 +482,8 @@ ixmlElement_removeAttributeNode( IN IXML_Element * element, * *=================================================================*/ IXML_NodeList * -ixmlElement_getElementsByTagName( IN IXML_Element * element, - IN const char *tagName ) +ixmlElement_getElementsByTagName(IXML_Element *element, + const DOMString tagName) { IXML_NodeList *returnNodeList = NULL; diff --git a/ixml/src/ixml.c b/ixml/src/ixml.c index f3b6ea8..49bdd38 100644 --- a/ixml/src/ixml.c +++ b/ixml/src/ixml.c @@ -30,16 +30,16 @@ **************************************************************************/ -#include "ixmldebug.h" -#include "ixmlmembuf.h" -#include "ixmlparser.h" - - /*! * \file */ +#include "ixmldebug.h" +#include "ixmlmembuf.h" +#include "ixmlparser.h" + + /*! * \todo Documentation. */ diff --git a/ixml/src/namedNodeMap.c b/ixml/src/namedNodeMap.c index a9f45e9..b618614 100644 --- a/ixml/src/namedNodeMap.c +++ b/ixml/src/namedNodeMap.c @@ -1,36 +1,38 @@ -/////////////////////////////////////////////////////////////////////////// -// -// Copyright (c) 2000-2003 Intel Corporation -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are met: -// -// * Redistributions of source code must retain the above copyright notice, -// this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above copyright notice, -// this list of conditions and the following disclaimer in the documentation -// and/or other materials provided with the distribution. -// * Neither name of Intel Corporation nor the names of its contributors -// may be used to endorse or promote products derived from this software -// without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -/////////////////////////////////////////////////////////////////////////// +/************************************************************************** + * + * Copyright (c) 2000-2003 Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * - Neither name of Intel Corporation nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY + * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + **************************************************************************/ + #include "ixmlparser.h" + /*================================================================ * NamedNodeMap_getItemNumber * return the item number of a item in NamedNodeMap. @@ -91,8 +93,8 @@ ixmlNamedNodeMap_init( IN IXML_NamedNodeMap * nnMap ) * *=================================================================*/ IXML_Node * -ixmlNamedNodeMap_getNamedItem( IN IXML_NamedNodeMap * nnMap, - IN const char *name ) +ixmlNamedNodeMap_getNamedItem(IXML_NamedNodeMap *nnMap, + const DOMString name) { long index;