cargilld 2005/04/24 03:22:16
Modified: c/src/xercesc/framework XMLErrorCodes.hpp
c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
IGXMLScanner2.cpp SGXMLScanner.cpp WFXMLScanner.cpp
XSAXMLScanner.cpp
c/src/xercesc/NLS/EN_US XMLErrList_EN_US.Xml
c/src/xercesc/util/MsgLoaders/ICU/resources en_US.txt
c/src/xercesc/util/MsgLoaders/InMemory
XercesMessages_en_US.hpp
c/src/xercesc/util/MsgLoaders/MsgCatalog
XercesMessages_en_US.Msg
c/src/xercesc/util/Platforms/Win32 Version.rc
Log:
Update error messages for detecting invalid qualified names. Fix
xercesc-1404 at the same time.
Revision Changes Path
1.22 +5 -1 xml-xerces/c/src/xercesc/framework/XMLErrorCodes.hpp
Index: XMLErrorCodes.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/framework/XMLErrorCodes.hpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XMLErrorCodes.hpp 29 Jan 2004 11:46:29 -0000 1.21
+++ XMLErrorCodes.hpp 24 Apr 2005 10:22:15 -0000 1.22
@@ -321,7 +321,11 @@
, XMLURINotMatchXMLPrefix = 304
, NoXMLNSAsElementPrefix = 305
, CT_SimpleTypeChildRequired = 306
- , F_HighBounds = 307
+ , InvalidRootElemInDOCTYPE = 307
+ , InvalidElementName = 308
+ , InvalidAttrName = 309
+ , InvalidEntityRefName = 310
+ , F_HighBounds = 311
};
static bool isFatal(const XMLErrs::Codes toCheck)
1.64 +17 -5 xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
Index: DGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- DGXMLScanner.cpp 5 Apr 2005 15:12:36 -0000 1.63
+++ DGXMLScanner.cpp 24 Apr 2005 10:22:15 -0000 1.64
@@ -791,7 +791,10 @@
fReaderMgr.getName(bbRootName.getBuffer());
if (!validName)
{
- emitError(XMLErrs::NoRootElemInDOCTYPE);
+ if (bbRootName.isEmpty())
+ emitError(XMLErrs::NoRootElemInDOCTYPE);
+ else
+ emitError(XMLErrs::InvalidRootElemInDOCTYPE,
bbRootName.getRawBuffer());
fReaderMgr.skipPastChar(chCloseAngle);
return;
}
@@ -1105,7 +1108,10 @@
fReaderMgr.getName(fQNameBuf);
if (!validName)
{
- emitError(XMLErrs::ExpectedElementName);
+ if (fQNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedElementName);
+ else
+ emitError(XMLErrs::InvalidElementName,
fQNameBuf.getRawBuffer());
fReaderMgr.skipToChar(chOpenAngle);
return false;
}
@@ -1258,7 +1264,10 @@
fReaderMgr.getName(fAttNameBuf);
if (!validName)
{
- emitError(XMLErrs::ExpectedAttrName);
+ if (fAttNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedAttrName);
+ else
+ emitError(XMLErrs::InvalidAttrName,
fAttNameBuf.getRawBuffer());
fReaderMgr.skipPastChar(chCloseAngle);
return false;
}
@@ -3160,7 +3169,10 @@
fReaderMgr.getName(bbName.getBuffer());
if (!validName)
{
- emitError(XMLErrs::ExpectedEntityRefName);
+ if (bbName.isEmpty())
+ emitError(XMLErrs::ExpectedEntityRefName);
+ else
+ emitError(XMLErrs::InvalidEntityRefName, bbName.getRawBuffer());
return EntityExp_Failed;
}
1.91 +16 -7 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- IGXMLScanner.cpp 5 Apr 2005 15:12:36 -0000 1.90
+++ IGXMLScanner.cpp 24 Apr 2005 10:22:15 -0000 1.91
@@ -636,8 +636,11 @@
// the input.
int colonPosition;
if (!fReaderMgr.getQName(fAttNameBuf, &colonPosition))
- {
- emitError(XMLErrs::ExpectedAttrName);
+ {
+ if (fAttNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedAttrName);
+ else
+ emitError(XMLErrs::InvalidAttrName,
fAttNameBuf.getRawBuffer());
fReaderMgr.skipPastChar(chCloseAngle);
return attCount;
}
@@ -1242,8 +1245,11 @@
bool validName = fDoNamespaces ?
fReaderMgr.getQName(bbRootName.getBuffer(), &colonPosition) :
fReaderMgr.getName(bbRootName.getBuffer());
if (!validName)
- {
- emitError(XMLErrs::NoRootElemInDOCTYPE);
+ {
+ if (bbRootName.isEmpty())
+ emitError(XMLErrs::NoRootElemInDOCTYPE);
+ else
+ emitError(XMLErrs::InvalidRootElemInDOCTYPE,
bbRootName.getRawBuffer());
fReaderMgr.skipPastChar(chCloseAngle);
return;
}
@@ -2126,8 +2132,11 @@
// in the element name.
int prefixColonPos;
if (!fReaderMgr.getQName(fQNameBuf, &prefixColonPos))
- {
- emitError(XMLErrs::ExpectedElementName);
+ {
+ if (fQNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedElementName);
+ else
+ emitError(XMLErrs::InvalidElementName, fQNameBuf.getRawBuffer());
fReaderMgr.skipToChar(chOpenAngle);
return false;
}
1.86 +6 -3 xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp
Index: IGXMLScanner2.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner2.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- IGXMLScanner2.cpp 5 Apr 2005 15:12:36 -0000 1.85
+++ IGXMLScanner2.cpp 24 Apr 2005 10:22:15 -0000 1.86
@@ -2876,8 +2876,11 @@
bool validName = fDoNamespaces ? fReaderMgr.getQName(bbName.getBuffer(),
&colonPosition) :
fReaderMgr.getName(bbName.getBuffer());
if (!validName)
- {
- emitError(XMLErrs::ExpectedEntityRefName);
+ {
+ if (bbName.isEmpty())
+ emitError(XMLErrs::ExpectedEntityRefName);
+ else
+ emitError(XMLErrs::InvalidEntityRefName, bbName.getRawBuffer());
return EntityExp_Failed;
}
1.112 +15 -6 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- SGXMLScanner.cpp 5 Apr 2005 15:12:36 -0000 1.111
+++ SGXMLScanner.cpp 24 Apr 2005 10:22:15 -0000 1.112
@@ -562,8 +562,11 @@
// the input.
int colonPosition;
if (!fReaderMgr.getQName(fAttNameBuf, &colonPosition))
- {
- emitError(XMLErrs::ExpectedAttrName);
+ {
+ if (fAttNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedAttrName);
+ else
+ emitError(XMLErrs::InvalidAttrName,
fAttNameBuf.getRawBuffer());
fReaderMgr.skipPastChar(chCloseAngle);
return attCount;
}
@@ -1082,7 +1085,10 @@
int prefixColonPos;
if (!fReaderMgr.getQName(fQNameBuf, &prefixColonPos))
{
- emitError(XMLErrs::ExpectedElementName);
+ if (fQNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedElementName);
+ else
+ emitError(XMLErrs::InvalidElementName, fQNameBuf.getRawBuffer());
fReaderMgr.skipToChar(chOpenAngle);
return false;
}
@@ -4446,8 +4452,11 @@
XMLBufBid bbName(&fBufMgr);
int colonPosition;
if (!fReaderMgr.getQName(bbName.getBuffer(), &colonPosition))
- {
- emitError(XMLErrs::ExpectedEntityRefName);
+ {
+ if (bbName.isEmpty())
+ emitError(XMLErrs::ExpectedEntityRefName);
+ else
+ emitError(XMLErrs::InvalidEntityRefName, bbName.getRawBuffer());
return EntityExp_Failed;
}
1.30 +11 -5 xml-xerces/c/src/xercesc/internal/WFXMLScanner.cpp
Index: WFXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/WFXMLScanner.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- WFXMLScanner.cpp 4 Apr 2005 15:11:38 -0000 1.29
+++ WFXMLScanner.cpp 24 Apr 2005 10:22:15 -0000 1.30
@@ -1099,8 +1099,11 @@
// in the element name.
int colonPosition;
if (!fReaderMgr.getQName(fQNameBuf, &colonPosition))
- {
- emitError(XMLErrs::ExpectedElementName);
+ {
+ if (fQNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedElementName);
+ else
+ emitError(XMLErrs::InvalidElementName, fQNameBuf.getRawBuffer());
fReaderMgr.skipToChar(chOpenAngle);
return false;
}
@@ -1185,8 +1188,11 @@
// the input.
int colonPosition;
if (!fReaderMgr.getQName(fAttNameBuf, &colonPosition))
- {
- emitError(XMLErrs::ExpectedAttrName);
+ {
+ if (fAttNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedAttrName);
+ else
+ emitError(XMLErrs::InvalidAttrName,
fAttNameBuf.getRawBuffer());
fReaderMgr.skipPastChar(chCloseAngle);
return false;
}
1.8 +6 -3 xml-xerces/c/src/xercesc/internal/XSAXMLScanner.cpp
Index: XSAXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XSAXMLScanner.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSAXMLScanner.cpp 4 Apr 2005 15:11:38 -0000 1.7
+++ XSAXMLScanner.cpp 24 Apr 2005 10:22:15 -0000 1.8
@@ -194,8 +194,11 @@
// in the element name.
int prefixColonPos;
if (!fReaderMgr.getQName(fQNameBuf, &prefixColonPos))
- {
- emitError(XMLErrs::ExpectedElementName);
+ {
+ if (fQNameBuf.isEmpty())
+ emitError(XMLErrs::ExpectedElementName);
+ else
+ emitError(XMLErrs::InvalidElementName, fQNameBuf.getRawBuffer());
fReaderMgr.skipToChar(chOpenAngle);
return false;
}
1.57 +5 -1 xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml
Index: XMLErrList_EN_US.Xml
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/NLS/EN_US/XMLErrList_EN_US.Xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- XMLErrList_EN_US.Xml 20 Feb 2005 01:58:16 -0000 1.56
+++ XMLErrList_EN_US.Xml 24 Apr 2005 10:22:16 -0000 1.57
@@ -313,6 +313,10 @@
<Message Id="XMLURINotMatchXMLPrefix" Text="The namespace for
'xml' cannot be bound to any prefix other than 'xml'."/>
<Message Id="NoXMLNSAsElementPrefix" Text="Element '{0}' cannot
have 'xmlns' as its prefix."/>
<Message Id="CT_SimpleTypeChildRequired" Text="Complex Type
Definition Representation OK - 2.2: <restriction> must have a
<simpleType> child."/>
+ <Message Id="InvalidRootElemInDOCTYPE" Text="DOCTYPE
root element qname beginning with '{0}' invalid"/>
+ <Message Id="InvalidElementName" Text="Element qname
beginning with '{0}' invalid"/>
+ <Message Id="InvalidAttrName" Text="Attribute qname
beginning with '{0}' invalid"/>
+ <Message Id="InvalidEntityRefName" Text="Entity qname
for reference beginning '{0}' invalid"/>
</FatalError>
</MsgDomain>
<MsgDomain Domain="http://apache.org/xml/messages/XMLValidity";>
@@ -481,7 +485,7 @@
<Message Id="Gen_UnexpectedEOF" Text="The end of input was not
expected"/>
<Message Id="HshTbl_ZeroModulus" Text="The hash modulus cannot
be zero"/>
<Message Id="HshTbl_BadHashFromKey" Text="Hashing the key
returned an invalid bad hash value"/>
- <Message Id="HshTbl_NoSuchKeyExists" Text="The key '{0}' could
not be found in the hash table"/>
+ <Message Id="HshTbl_NoSuchKeyExists" Text="The key could not be
found in the hash table"/>
<Message Id="Mutex_CouldNotCreate" Text="Could not create
mutex"/>
<Message Id="Mutex_CouldNotClose" Text="Could not close mutex"/>
<Message Id="Mutex_CouldNotLock" Text="Could not lock mutex"/>
1.49 +5 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt
Index: en_US.txt
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/ICU/resources/en_US.txt,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- en_US.txt 20 Feb 2005 01:58:16 -0000 1.48
+++ en_US.txt 24 Apr 2005 10:22:16 -0000 1.49
@@ -308,6 +308,10 @@
"The namespace for 'xml' cannot be bound to any prefix other
than 'xml'. " ,
"Element '{0}' cannot have 'xmlns' as its prefix. " ,
"Complex Type Definition Representation OK - 2.2: <restriction>
must have a <simpleType> child. " ,
+ "DOCTYPE root element qname beginning with '{0}' invalid " ,
+ "Element qname beginning with '{0}' invalid " ,
+ "Attribute qname beginning with '{0}' invalid " ,
+ "Entity qname for reference beginning '{0}' invalid " ,
"F_ End " ,
}
@@ -482,7 +486,7 @@
"The end of input was not expected " ,
"The hash modulus cannot be zero " ,
"Hashing the key returned an invalid bad hash value " ,
- "The key '{0}' could not be found in the hash table " ,
+ "The key could not be found in the hash table " ,
"Could not create mutex " ,
"Could not close mutex " ,
"Could not lock mutex " ,
1.39 +11 -3
xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp
Index: XercesMessages_en_US.hpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/InMemory/XercesMessages_en_US.hpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- XercesMessages_en_US.hpp 20 Feb 2005 01:58:16 -0000 1.38
+++ XercesMessages_en_US.hpp 24 Apr 2005 10:22:16 -0000 1.39
@@ -674,10 +674,18 @@
, {
0x0043,0x006F,0x006D,0x0070,0x006C,0x0065,0x0078,0x0020,0x0054,0x0079,0x0070,0x0065,0x0020,0x0044,0x0065,0x0066,0x0069,0x006E,0x0069,0x0074,0x0069,0x006F,0x006E,0x0020,0x0052,0x0065,0x0070,0x0072,0x0065,0x0073,0x0065,0x006E,0x0074,0x0061,0x0074,
0x0069,0x006F,0x006E,0x0020,0x004F,0x004B,0x0020,0x002D,0x0020,0x0032,0x002E,0x0032,0x003A,0x0020,0x003C,0x0072,0x0065,0x0073,0x0074,0x0072,0x0069,0x0063,0x0074,0x0069,0x006F,0x006E,0x003E,0x0020,0x006D,0x0075,0x0073,0x0074,0x0020,0x0068,0x0061,
0x0076,0x0065,0x0020,0x0061,0x0020,0x003C,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x0054,0x0079,0x0070,0x0065,0x003E,0x0020,0x0063,0x0068,0x0069,0x006C,0x0064,0x002E,0x00
}
+ , {
0x0044,0x004F,0x0043,0x0054,0x0059,0x0050,0x0045,0x0020,0x0072,0x006F,0x006F,0x0074,0x0020,0x0065,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0071,0x006E,0x0061,0x006D,0x0065,0x0020,0x0062,0x0065,0x0067,0x0069,0x006E,0x006E,0x0069,0x006E,
+
0x0067,0x0020,0x0077,0x0069,0x0074,0x0068,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x00
}
+ , {
0x0045,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0020,0x0071,0x006E,0x0061,0x006D,0x0065,0x0020,0x0062,0x0065,0x0067,0x0069,0x006E,0x006E,0x0069,0x006E,0x0067,0x0020,0x0077,0x0069,0x0074,0x0068,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,
+ 0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x00 }
+ , {
0x0041,0x0074,0x0074,0x0072,0x0069,0x0062,0x0075,0x0074,0x0065,0x0020,0x0071,0x006E,0x0061,0x006D,0x0065,0x0020,0x0062,0x0065,0x0067,0x0069,0x006E,0x006E,0x0069,0x006E,0x0067,0x0020,0x0077,0x0069,0x0074,0x0068,0x0020,0x0027,0x007B,0x0030,0x007D,
+ 0x0027,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x00 }
+ , {
0x0045,0x006E,0x0074,0x0069,0x0074,0x0079,0x0020,0x0071,0x006E,0x0061,0x006D,0x0065,0x0020,0x0066,0x006F,0x0072,0x0020,0x0072,0x0065,0x0066,0x0065,0x0072,0x0065,0x006E,0x0063,0x0065,0x0020,0x0062,0x0065,0x0067,0x0069,0x006E,0x006E,0x0069,0x006E,
+
0x0067,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,0x00
}
, { 0x0046,0x005F,0x0045,0x006E,0x0064,0x00 }
};
-const unsigned int gXMLErrArraySize = 308;
+const unsigned int gXMLErrArraySize = 312;
const XMLCh gXMLValidityArray[][128] =
{
@@ -1003,8 +1011,8 @@
, {
0x0054,0x0068,0x0065,0x0020,0x0068,0x0061,0x0073,0x0068,0x0020,0x006D,0x006F,0x0064,0x0075,0x006C,0x0075,0x0073,0x0020,0x0063,0x0061,0x006E,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x007A,0x0065,0x0072,0x006F,0x00
}
, {
0x0048,0x0061,0x0073,0x0068,0x0069,0x006E,0x0067,0x0020,0x0074,0x0068,0x0065,0x0020,0x006B,0x0065,0x0079,0x0020,0x0072,0x0065,0x0074,0x0075,0x0072,0x006E,0x0065,0x0064,0x0020,0x0061,0x006E,0x0020,0x0069,0x006E,0x0076,0x0061,0x006C,0x0069,0x0064,
0x0020,0x0062,0x0061,0x0064,0x0020,0x0068,0x0061,0x0073,0x0068,0x0020,0x0076,0x0061,0x006C,0x0075,0x0065,0x00
}
- , {
0x0054,0x0068,0x0065,0x0020,0x006B,0x0065,0x0079,0x0020,0x0027,0x007B,0x0030,0x007D,0x0027,0x0020,0x0063,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x0020,0x0069,0x006E,
-
0x0020,0x0074,0x0068,0x0065,0x0020,0x0068,0x0061,0x0073,0x0068,0x0020,0x0074,0x0061,0x0062,0x006C,0x0065,0x00
}
+ , {
0x0054,0x0068,0x0065,0x0020,0x006B,0x0065,0x0079,0x0020,0x0063,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0062,0x0065,0x0020,0x0066,0x006F,0x0075,0x006E,0x0064,0x0020,0x0069,0x006E,0x0020,0x0074,0x0068,0x0065,0x0020,0x0068,
+ 0x0061,0x0073,0x0068,0x0020,0x0074,0x0061,0x0062,0x006C,0x0065,0x00 }
, {
0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0063,0x0072,0x0065,0x0061,0x0074,0x0065,0x0020,0x006D,0x0075,0x0074,0x0065,0x0078,0x00
}
, {
0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x0063,0x006C,0x006F,0x0073,0x0065,0x0020,0x006D,0x0075,0x0074,0x0065,0x0078,0x00
}
, {
0x0043,0x006F,0x0075,0x006C,0x0064,0x0020,0x006E,0x006F,0x0074,0x0020,0x006C,0x006F,0x0063,0x006B,0x0020,0x006D,0x0075,0x0074,0x0065,0x0078,0x00
}
1.38 +5 -1
xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg
Index: XercesMessages_en_US.Msg
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/MsgLoaders/MsgCatalog/XercesMessages_en_US.Msg,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- XercesMessages_en_US.Msg 20 Feb 2005 01:58:16 -0000 1.37
+++ XercesMessages_en_US.Msg 24 Apr 2005 10:22:16 -0000 1.38
@@ -301,6 +301,10 @@
304 The namespace for 'xml' cannot be bound to any prefix other than 'xml'.
305 Element '{0}' cannot have 'xmlns' as its prefix.
306 Complex Type Definition Representation OK - 2.2: <restriction> must
have a <simpleType> child.
+307 DOCTYPE root element qname beginning with '{0}' invalid
+308 Element qname beginning with '{0}' invalid
+309 Attribute qname beginning with '{0}' invalid
+310 Entity qname for reference beginning '{0}' invalid
$set 2
@@ -465,7 +469,7 @@
47 The end of input was not expected
48 The hash modulus cannot be zero
49 Hashing the key returned an invalid bad hash value
-50 The key '{0}' could not be found in the hash table
+50 The key could not be found in the hash table
51 Could not create mutex
52 Could not close mutex
53 Could not lock mutex
1.69 +5 -1 xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc
Index: Version.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/Win32/Version.rc,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- Version.rc 20 Feb 2005 01:58:17 -0000 1.68
+++ Version.rc 24 Apr 2005 10:22:16 -0000 1.69
@@ -403,6 +403,10 @@
304
L"\x0054\x0068\x0065\x0020\x006E\x0061\x006D\x0065\x0073\x0070\x0061\x0063\x0065\x0020\x0066\x006F\x0072\x0020\x0027\x0078\x006D\x006C\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x0062\x006F\x0075\x006E\x0064\x0020\x0074\x006F\x0020\x0061\x006E\x0079\x0020\x0070\x0072\x0065\x0066\x0069\x0078\x0020\x006F\x0074\x0068\x0065\x0072\x0020\x0074\x0068\x0061\x006E\x0020\x0027\x0078\x006D\x006C\x0027\x002E\x00"
305
L"\x0045\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0027\x0078\x006D\x006C\x006E\x0073\x0027\x0020\x0061\x0073\x0020\x0069\x0074\x0073\x0020\x0070\x0072\x0065\x0066\x0069\x0078\x002E\x00"
306
L"\x0043\x006F\x006D\x0070\x006C\x0065\x0078\x0020\x0054\x0079\x0070\x0065\x0020\x0044\x0065\x0066\x0069\x006E\x0069\x0074\x0069\x006F\x006E\x0020\x0052\x0065\x0070\x0072\x0065\x0073\x0065\x006E\x0074\x0061\x0074\x0069\x006F\x006E\x0020\x004F\x004B\x0020\x002D\x0020\x0032\x002E\x0032\x003A\x0020\x003C\x0072\x0065\x0073\x0074\x0072\x0069\x0063\x0074\x0069\x006F\x006E\x003E\x0020\x006D\x0075\x0073\x0074\x0020\x0068\x0061\x0076\x0065\x0020\x0061\x0020\x003C\x0073\x0069\x006D\x0070\x006C\x0065\x0054\x0079\x0070\x0065\x003E\x0020\x0063\x0068\x0069\x006C\x0064\x002E\x00"
+ 307
L"\x0044\x004F\x0043\x0054\x0059\x0050\x0045\x0020\x0072\x006F\x006F\x0074\x0020\x0065\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0071\x006E\x0061\x006D\x0065\x0020\x0062\x0065\x0067\x0069\x006E\x006E\x0069\x006E\x0067\x0020\x0077\x0069\x0074\x0068\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x00"
+ 308
L"\x0045\x006C\x0065\x006D\x0065\x006E\x0074\x0020\x0071\x006E\x0061\x006D\x0065\x0020\x0062\x0065\x0067\x0069\x006E\x006E\x0069\x006E\x0067\x0020\x0077\x0069\x0074\x0068\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x00"
+ 309
L"\x0041\x0074\x0074\x0072\x0069\x0062\x0075\x0074\x0065\x0020\x0071\x006E\x0061\x006D\x0065\x0020\x0062\x0065\x0067\x0069\x006E\x006E\x0069\x006E\x0067\x0020\x0077\x0069\x0074\x0068\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x00"
+ 310
L"\x0045\x006E\x0074\x0069\x0074\x0079\x0020\x0071\x006E\x0061\x006D\x0065\x0020\x0066\x006F\x0072\x0020\x0072\x0065\x0066\x0065\x0072\x0065\x006E\x0063\x0065\x0020\x0062\x0065\x0067\x0069\x006E\x006E\x0069\x006E\x0067\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x00"
END
STRINGTABLE DISCARDABLE
BEGIN
@@ -567,7 +571,7 @@
8239
L"\x0054\x0068\x0065\x0020\x0065\x006E\x0064\x0020\x006F\x0066\x0020\x0069\x006E\x0070\x0075\x0074\x0020\x0077\x0061\x0073\x0020\x006E\x006F\x0074\x0020\x0065\x0078\x0070\x0065\x0063\x0074\x0065\x0064\x00"
8240
L"\x0054\x0068\x0065\x0020\x0068\x0061\x0073\x0068\x0020\x006D\x006F\x0064\x0075\x006C\x0075\x0073\x0020\x0063\x0061\x006E\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x007A\x0065\x0072\x006F\x00"
8241
L"\x0048\x0061\x0073\x0068\x0069\x006E\x0067\x0020\x0074\x0068\x0065\x0020\x006B\x0065\x0079\x0020\x0072\x0065\x0074\x0075\x0072\x006E\x0065\x0064\x0020\x0061\x006E\x0020\x0069\x006E\x0076\x0061\x006C\x0069\x0064\x0020\x0062\x0061\x0064\x0020\x0068\x0061\x0073\x0068\x0020\x0076\x0061\x006C\x0075\x0065\x00"
- 8242
L"\x0054\x0068\x0065\x0020\x006B\x0065\x0079\x0020\x0027\x007B\x0030\x007D\x0027\x0020\x0063\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x0066\x006F\x0075\x006E\x0064\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0068\x0061\x0073\x0068\x0020\x0074\x0061\x0062\x006C\x0065\x00"
+ 8242
L"\x0054\x0068\x0065\x0020\x006B\x0065\x0079\x0020\x0063\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0062\x0065\x0020\x0066\x006F\x0075\x006E\x0064\x0020\x0069\x006E\x0020\x0074\x0068\x0065\x0020\x0068\x0061\x0073\x0068\x0020\x0074\x0061\x0062\x006C\x0065\x00"
8243
L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0063\x0072\x0065\x0061\x0074\x0065\x0020\x006D\x0075\x0074\x0065\x0078\x00"
8244
L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x0063\x006C\x006F\x0073\x0065\x0020\x006D\x0075\x0074\x0065\x0078\x00"
8245
L"\x0043\x006F\x0075\x006C\x0064\x0020\x006E\x006F\x0074\x0020\x006C\x006F\x0063\x006B\x0020\x006D\x0075\x0074\x0065\x0078\x00"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
