cvs commit: xml-xalan/c/src/DOMSupport DOMServices.cpp

[dbertoni]

dbertoni    01/09/14 13:02:18

  Modified:    c/src/DOMSupport DOMServices.cpp
  Log:
  Added asserts.  Use document element instead of first child for document data.
  
  Revision  Changes    Path
  1.32      +12 -10    xml-xalan/c/src/DOMSupport/DOMServices.cpp
  
  Index: DOMServices.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMServices.cpp,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DOMServices.cpp   2001/09/10 17:17:47     1.31
  +++ DOMServices.cpp   2001/09/14 20:02:18     1.32
  @@ -396,7 +396,9 @@
                        const XalanDocument&    document,
                        XalanDOMString&                 data)
   {
  -     getChildrenData(document.getFirstChild(), data);
  +     assert(document.getDocumentElement() != 0);
  +
  +     getChildrenData(document.getDocumentElement(), data);
   }
   
   
  @@ -615,7 +617,7 @@
                        FormatterListener&              formatterListener,
                        MemberFunctionPtr               function)
   {
  -     getChildrenData(document.getFirstChild(), formatterListener, function);
  +     getChildrenData(document.getDocumentElement(), formatterListener, 
function);
   }
   
   
  @@ -692,7 +694,11 @@
   const XalanDOMString&
   DOMServices::getNamespaceOfNode(const XalanNode&     n)
   {
  -     if (n.getNodeType() == XalanNode::ATTRIBUTE_NODE)
  +     if (n.getNodeType() != XalanNode::ATTRIBUTE_NODE)
  +     {
  +             return n.getNamespaceURI();
  +     }
  +     else
        {
                const XalanDOMString&   theNodeName = n.getNodeName();
   
  @@ -707,10 +713,6 @@
                        return n.getNamespaceURI();
                }
        }
  -     else
  -     {
  -             return n.getNamespaceURI();
  -     }
   }
   
   
  @@ -752,7 +754,7 @@
        {
                XalanNode::NodeType             type;
                const XalanNode*                parent = &namespaceContext;
  -    
  +
                // Consider elements until NS is resolved, or we run out of
                // ancestors, or we hit something other than an Element or 
                // EntityReference node (ie, Document or DocumentFragment)
  @@ -774,9 +776,9 @@
                                        const XalanNode* const  attr = 
nnm->item(i);
                                        assert(attr != 0);
   
  -                                     const XalanDOMString&           aname = 
attr->getNodeName();
  +                                     const XalanDOMString&   aname = 
attr->getNodeName();
   
  -                                     const unsigned int                      
len = length(aname);
  +                                     const unsigned int              len = 
length(aname);
   
                                        const bool isPrefix = len <= 
s_XMLNamespaceWithSeparatorLength ? false :
                                                        equals(substring(aname,
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]