(file) Return to XmlParser.h CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlParser.h between version 1.30.8.2 and 1.33

version 1.30.8.2, 2008/03/11 22:44:11 version 1.33, 2008/12/01 17:49:57
Line 1 
Line 1 
 //%2006////////////////////////////////////////////////////////////////////////  //%LICENSE////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development  // Licensed to The Open Group (TOG) under one or more contributor license
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.  // agreements.  Refer to the OpenPegasusNOTICE.txt file distributed with
 // Copyright (c) 2003 BMC Software; Hewlett-Packard Development Company, L.P.;  // this work for additional information regarding copyright ownership.
 // IBM Corp.; EMC Corporation, The Open Group.  // Each contributor licenses this file to you under the OpenPegasus Open
 // Copyright (c) 2004 BMC Software; Hewlett-Packard Development Company, L.P.;  // Source License; you may not use this file except in compliance with the
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.  // License.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; VERITAS Software Corporation; The Open Group.  
 // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;  
 // EMC Corporation; Symantec Corporation; The Open Group.  
 //  
 // Permission is hereby granted, free of charge, to any person obtaining a copy  
 // of this software and associated documentation files (the "Software"), to  
 // deal in the Software without restriction, including without limitation the  
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or  
 // sell copies of the Software, and to permit persons to whom the Software is  
 // furnished to do so, subject to the following conditions:  
 //  
 // THE ABOVE COPYRIGHT NOTICE AND THIS PERMISSION NOTICE SHALL BE INCLUDED IN  
 // ALL COPIES OR SUBSTANTIAL PORTIONS OF THE SOFTWARE. THE SOFTWARE IS PROVIDED  
 // "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT  
 // LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR  
 // PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT  
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN  
 // ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION  
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  
 // //
 //==============================================================================  // Permission is hereby granted, free of charge, to any person obtaining a
   // copy of this software and associated documentation files (the "Software"),
   // to deal in the Software without restriction, including without limitation
   // the rights to use, copy, modify, merge, publish, distribute, sublicense,
   // and/or sell copies of the Software, and to permit persons to whom the
   // Software is furnished to do so, subject to the following conditions:
   //
   // The above copyright notice and this permission notice shall be included
   // in all copies or substantial portions of the Software.
   //
   // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
   // OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   // IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   // CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   //
   //////////////////////////////////////////////////////////////////////////
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
  
Line 58 
Line 56 
         UNTERMINATED_COMMENT,         UNTERMINATED_COMMENT,
         UNTERMINATED_CDATA,         UNTERMINATED_CDATA,
         UNTERMINATED_DOCTYPE,         UNTERMINATED_DOCTYPE,
         TOO_MANY_ATTRIBUTES,  
         MALFORMED_REFERENCE,         MALFORMED_REFERENCE,
         EXPECTED_COMMENT_OR_CDATA,         EXPECTED_COMMENT_OR_CDATA,
         START_END_MISMATCH,         START_END_MISMATCH,
         UNCLOSED_TAGS,         UNCLOSED_TAGS,
         MULTIPLE_ROOTS,         MULTIPLE_ROOTS,
         VALIDATION_ERROR,         VALIDATION_ERROR,
         SEMANTIC_ERROR          SEMANTIC_ERROR,
           UNDECLARED_NAMESPACE
     };     };
  
  
Line 114 
Line 112 
  
 struct XmlAttribute struct XmlAttribute
 { {
       int nsType;
     const char* name;     const char* name;
       const char* localName;
     const char* value;     const char* value;
 }; };
  
 struct PEGASUS_COMMON_LINKAGE XmlEntry struct PEGASUS_COMMON_LINKAGE XmlEntry
 { {
     enum CIMType      enum XmlEntryType
     {     {
         XML_DECLARATION,         XML_DECLARATION,
         START_TAG,         START_TAG,
Line 132 
Line 132 
         CONTENT         CONTENT
     };     };
  
     CIMType type;      XmlEntryType type;
     int nsType;  
     const char* text;     const char* text;
       int nsType;            // Only applies to START_TAG, EMPTY_TAG, and END_TAG
       const char* localName; // Only applies to START_TAG, EMPTY_TAG, and END_TAG
     Array<XmlAttribute> attributes;     Array<XmlAttribute> attributes;
  
     void print() const;     void print() const;
  
     const XmlAttribute* findAttribute(const char* name) const;     const XmlAttribute* findAttribute(const char* name) const;
  
       const XmlAttribute* findAttribute(int attrNsType, const char* name) const;
   
     Boolean getAttributeValue(const char* name, Uint32& value) const;     Boolean getAttributeValue(const char* name, Uint32& value) const;
  
     Boolean getAttributeValue(const char* name, Real32& value) const;     Boolean getAttributeValue(const char* name, Real32& value) const;
Line 177 
Line 180 
     Uint32 getLine() const { return _line; }     Uint32 getLine() const { return _line; }
  
     XmlNamespace* getNamespace(int nsType);     XmlNamespace* getNamespace(int nsType);
     int getSupportedNamespaceType(const char* extendedName);  
  
 private: private:
  
     Boolean _getElementName(char*& p);      Boolean _getElementName(char*& p, const char*& localName);
  
     Boolean _getOpenElementName(char*& p, Boolean& openCloseElement);      Boolean _getOpenElementName(
           char*& p,
           const char*& localName,
           Boolean& openCloseElement);
  
     void _getAttributeNameAndEqual(char*& p);      void _getAttributeNameAndEqual(char*& p, const char*& localName);
  
     void _getComment(char*& p);     void _getComment(char*& p);
  
Line 197 
Line 202 
  
     int _getNamespaceType(const char* tag);     int _getNamespaceType(const char* tag);
  
       int _getSupportedNamespaceType(const char* extendedName);
   
     Uint32 _line;     Uint32 _line;
     char* _current;     char* _current;
     char _restoreChar;     char _restoreChar;
Line 204 
Line 211 
     Boolean _foundRoot;     Boolean _foundRoot;
     Stack<XmlEntry> _putBackStack;     Stack<XmlEntry> _putBackStack;
  
     Uint32 _scopeLevel;  
     XmlNamespace* _supportedNamespaces;     XmlNamespace* _supportedNamespaces;
     Stack<XmlNamespace> _nameSpaces;     Stack<XmlNamespace> _nameSpaces;
       int _currentUnsupportedNSType;
 }; };
  
 PEGASUS_COMMON_LINKAGE void XmlAppendCString( PEGASUS_COMMON_LINKAGE void XmlAppendCString(


Legend:
Removed from v.1.30.8.2  
changed lines
  Added in v.1.33

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2