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

Diff for /pegasus/src/Pegasus/Common/XmlParser.cpp between version 1.45 and 1.48

version 1.45, 2008/04/29 20:40:24 version 1.48, 2008/08/12 17:35:08
Line 210 
Line 210 
     const String& message)     const String& message)
 { {
     String dftMsg = _xmlMessages[Uint32(code) - 1];     String dftMsg = _xmlMessages[Uint32(code) - 1];
     String key = _xmlKeys[Uint32(code) - 1];      const char* key = _xmlKeys[Uint32(code) - 1];
     String msg = message;     String msg = message;
  
     dftMsg.append(": on line $0");     dftMsg.append(": on line $0");
Line 220 
Line 220 
         dftMsg.append("$1");         dftMsg.append("$1");
     }     }
  
     return MessageLoaderParms(key, dftMsg, line ,msg);      return MessageLoaderParms(key, dftMsg.getCString(), line ,msg);
 } }
  
 static MessageLoaderParms _formPartialMessage(Uint32 code, Uint32 line) static MessageLoaderParms _formPartialMessage(Uint32 code, Uint32 line)
 { {
     String dftMsg = _xmlMessages[Uint32(code) - 1];     String dftMsg = _xmlMessages[Uint32(code) - 1];
     String key = _xmlKeys[Uint32(code) - 1];      const char* key = _xmlKeys[Uint32(code) - 1];
  
     dftMsg.append(": on line $0");     dftMsg.append(": on line $0");
  
     return MessageLoaderParms(key, dftMsg, line);      return MessageLoaderParms(key, dftMsg.getCString(), line);
 } }
  
  
Line 932 
Line 932 
         entry.type = XmlEntry::XML_DECLARATION;         entry.type = XmlEntry::XML_DECLARATION;
         entry.text = ++p;         entry.text = ++p;
  
         Boolean openCloseElement = false;  
   
         if (_getElementName(p, entry.localName))         if (_getElementName(p, entry.localName))
             return;             return;
     }     }
Line 1123 
Line 1121 
 } }
  
 const XmlAttribute* XmlEntry::findAttribute( const XmlAttribute* XmlEntry::findAttribute(
     int nsType,      int attrNsType,
     const char* name) const     const char* name) const
 { {
     for (Uint32 i = 0, n = attributes.size(); i < n; i++)     for (Uint32 i = 0, n = attributes.size(); i < n; i++)
     {     {
         if ((attributes[i].nsType == nsType) &&          if ((attributes[i].nsType == attrNsType) &&
             (strcmp(attributes[i].localName, name) == 0))             (strcmp(attributes[i].localName, name) == 0))
         {         {
             return &attributes[i];             return &attributes[i];


Legend:
Removed from v.1.45  
changed lines
  Added in v.1.48

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2