Changeset 153 for trunk/src/helpers/xml.c

Timestamp:

Apr 14, 2002, 1:42:05 AM (23 years ago)

Author:

umoeller

Message:

Lots of changes from the last three weeks.

File:

• trunk/src/helpers/xml.c (modified) (11 diffs)

trunk/src/helpers/xml.c

@@ -39 +39 @@
  *      was supposed to be a C-only interface, we cannot implement
  *      inheritance at the language level. Instead, each XML document
- *      is broken up into a tree of node structures only (see _DOMNODE),
+ *      is broken up into a tree of node structures only (see DOMNODE),
  *      each of which has a special type. The W3C DOM allows this
  *      (and calls this the "flattened" view, as opposed to the
@@ -55 +55 @@
  *          (internal subset).
  *
- *      --  Not all node types are implemented. See _DOMNODE for
+ *      --  Not all node types are implemented. See DOMNODE for
  *          the supported types.
  *
@@ -145 +145 @@
 
 /*
- *@@category: Helpers\C helpers\XML
+ *@@category: Helpers\XML
  *      see xml.c.
  */
 
 /*
- *@@category: Helpers\C helpers\XML\Document Object Model (DOM)
+ *@@category: Helpers\XML\Document Object Model (DOM)
  *      see xml.c.
  */
@@ -2650 +2650 @@
 /*
  *@@ xmlFindElementDecl:
- *      returns the _CMELEMENTDECLNODE for the element
+ *      returns the CMELEMENTDECLNODE for the element
  *      with the specified name or NULL if there's none.
  *
@@ -2678 +2678 @@
 /*
  *@@ xmlFindAttribDeclBase:
- *      returns the _CMATTRIBUTEDECLBASE for the specified
+ *      returns the CMATTRIBUTEDECLBASE for the specified
  *      element name, or NULL if none exists.
  *
@@ -2708 +2708 @@
 /*
  *@@ xmlFindAttribDecl:
- *      returns the _CMATTRIBUTEDEDECL for the specified
+ *      returns the CMATTRIBUTEDEDECL for the specified
  *      element and attribute name, or NULL if none exists.
  *
@@ -2766 +2766 @@
  *@@ xmlGetFirstChild:
  *      returns the first child node of pDomNode.
- *      See _DOMNODE for what a "child" can be for the
+ *      See DOMNODE for what a "child" can be for the
  *      various node types.
  *
@@ -2784 +2784 @@
  *@@ xmlGetLastChild:
  *      returns the last child node of pDomNode.
- *      See _DOMNODE for what a "child" can be for the
+ *      See DOMNODE for what a "child" can be for the
  *      various node types.
  *
@@ -2827 +2827 @@
 /*
  *@@ xmlGetElementsByTagName:
- *      returns a linked list of _DOMNODE nodes which
+ *      returns a linked list of DOMNODE nodes which
  *      match the specified element name. The special name
  *      "*" matches all elements.
@@ -2860 +2860 @@
             if (    (pDomNodeThis = (PDOMNODE)pNode->pItemData)
                  && (pDomNodeThis->NodeBase.ulNodeType == DOMNODE_ELEMENT)
-                 && (   fFindAll
-                     || (!strcmp(pcszName, pDomNodeThis->NodeBase.strNodeName.psz))
-                   )
+                 && (    (fFindAll)
+                      || (!strcmp(pcszName, pDomNodeThis->NodeBase.strNodeName.psz))
+                    )
                )
             {
@@ -2899 +2899 @@
     // note, cheap trick: no malloc here, but we need
     // an XSTRING for treeFind
-    pAttrNode = (PDOMNODE)treeFind(pElement->AttributesMap,
-                                   (ULONG)&str,
-                                   CompareXStrings);
-    if (pAttrNode)
+    if (pAttrNode = (PDOMNODE)treeFind(pElement->AttributesMap,
+                                       (ULONG)&str,
+                                       CompareXStrings))
         return (pAttrNode->pstrNodeValue);