Author: amassari
Date: Mon Nov 3 08:03:06 2008
New Revision: 710090
URL: http://svn.apache.org/viewvc?rev=710090&view=rev
Log:
Recognize ISO-10646-UCS-4 as a synonym for UCS-4
Modified:
xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
xerces/c/trunk/src/xercesc/util/TransService.cpp
xerces/c/trunk/src/xercesc/util/XMLUni.cpp
xerces/c/trunk/src/xercesc/util/XMLUni.hpp
Modified: xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp?rev=710090&r1=710089&r2=710090&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp (original)
+++ xerces/c/trunk/src/xercesc/dom/impl/DOMLSSerializerImpl.cpp Mon Nov 3
08:03:06 2008
@@ -1683,7 +1683,8 @@
else if ((XMLString::compareIStringASCII(fEncodingUsed,
XMLUni::fgUCS4EncodingString) == 0) ||
(XMLString::compareIStringASCII(fEncodingUsed,
XMLUni::fgUCS4EncodingString2) == 0) ||
(XMLString::compareIStringASCII(fEncodingUsed,
XMLUni::fgUCS4EncodingString3) == 0) ||
- (XMLString::compareIStringASCII(fEncodingUsed,
XMLUni::fgUCS4EncodingString4) == 0) )
+ (XMLString::compareIStringASCII(fEncodingUsed,
XMLUni::fgUCS4EncodingString4) == 0) ||
+ (XMLString::compareIStringASCII(fEncodingUsed,
XMLUni::fgUCS4EncodingString5) == 0) )
{
if (XMLPlatformUtils::fgXMLChBigEndian)
fFormatter->writeBOM(BOM_ucs4be, 4);
Modified: xerces/c/trunk/src/xercesc/internal/XMLReader.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/internal/XMLReader.cpp?rev=710090&r1=710089&r2=710090&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/internal/XMLReader.cpp (original)
+++ xerces/c/trunk/src/xercesc/internal/XMLReader.cpp Mon Nov 3 08:03:06 2008
@@ -1270,13 +1270,13 @@
// are already in one of the endian versions of those encodings,
// then just keep it and go on. Otherwise, its not valid.
//
- if (!XMLString::compareString(inputEncoding, XMLUni::fgUTF16EncodingString)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUTF16EncodingString2)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUTF16EncodingString3)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUTF16EncodingString4)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUTF16EncodingString5)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUTF16EncodingString6)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUTF16EncodingString7))
+ if (XMLString::equals(inputEncoding, XMLUni::fgUTF16EncodingString)
+ || XMLString::equals(inputEncoding, XMLUni::fgUTF16EncodingString2)
+ || XMLString::equals(inputEncoding, XMLUni::fgUTF16EncodingString3)
+ || XMLString::equals(inputEncoding, XMLUni::fgUTF16EncodingString4)
+ || XMLString::equals(inputEncoding, XMLUni::fgUTF16EncodingString5)
+ || XMLString::equals(inputEncoding, XMLUni::fgUTF16EncodingString6)
+ || XMLString::equals(inputEncoding, XMLUni::fgUTF16EncodingString7))
{
fMemoryManager->deallocate(inputEncoding);
@@ -1300,10 +1300,11 @@
fEncodingStr =
XMLString::replicate(XMLUni::fgUTF16BEncodingString, fMemoryManager);
}
}
- else if (!XMLString::compareString(inputEncoding,
XMLUni::fgUCS4EncodingString)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUCS4EncodingString2)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUCS4EncodingString3)
- || !XMLString::compareString(inputEncoding,
XMLUni::fgUCS4EncodingString4))
+ else if (XMLString::equals(inputEncoding, XMLUni::fgUCS4EncodingString)
+ || XMLString::equals(inputEncoding, XMLUni::fgUCS4EncodingString2)
+ || XMLString::equals(inputEncoding, XMLUni::fgUCS4EncodingString3)
+ || XMLString::equals(inputEncoding, XMLUni::fgUCS4EncodingString4)
+ || XMLString::equals(inputEncoding, XMLUni::fgUCS4EncodingString5))
{
fMemoryManager->deallocate(inputEncoding);
Modified: xerces/c/trunk/src/xercesc/util/TransService.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/TransService.cpp?rev=710090&r1=710089&r2=710090&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/TransService.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/TransService.cpp Mon Nov 3 08:03:06 2008
@@ -82,11 +82,11 @@
}
// ---------------------------------------------------------------------------
-// Allow user specific encodings to be added to the mappings table.
-// Should be called after platform init
+// Allow user specific encodings to be added to the mappings table.
+// Should be called after platform init
// ---------------------------------------------------------------------------
void XMLTransService::addEncoding(const XMLCh* const encoding,
- ENameMap*
const ownMapping)
+ ENameMap* const ownMapping)
{
gMappings->put((void *) encoding, ownMapping);
}
@@ -142,7 +142,7 @@
// If we found it, then call the factory method for it
if (ourMapping)
- {
+ {
XMLTranscoder* temp = ourMapping->makeNew(blockSize, manager);
resValue = temp ? XMLTransService::Ok :
XMLTransService::InternalFailure;
return temp;
@@ -181,7 +181,7 @@
ENameMap* ourMapping = gMappingsRecognizer->elementAt(encodingEnum);
// If we found it, then call the factory method for it
- if (ourMapping) {
+ if (ourMapping) {
XMLTranscoder* temp = ourMapping->makeNew(blockSize, manager);
resValue = temp ? XMLTransService::Ok :
XMLTransService::InternalFailure;
return temp;
@@ -260,7 +260,7 @@
gMappingsRecognizer->setElementAt(new
EEndianNameMapFor<XMLUTF16Transcoder>(XMLUni::fgUTF16LEncodingString, swapped),
XMLRecognizer::UTF_16L);
gMappings->put
(
- (void*)XMLUni::fgUTF16LEncodingString,
+ (void*)XMLUni::fgUTF16LEncodingString,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16LEncodingString
@@ -270,7 +270,7 @@
gMappings->put
(
- (void*)XMLUni::fgUTF16LEncodingString2,
+ (void*)XMLUni::fgUTF16LEncodingString2,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16LEncodingString2
@@ -281,7 +281,7 @@
gMappingsRecognizer->setElementAt(new
EEndianNameMapFor<XMLUCS4Transcoder>(XMLUni::fgUCS4LEncodingString, swapped),
XMLRecognizer::UCS_4L);
gMappings->put
(
- (void*)XMLUni::fgUCS4LEncodingString,
+ (void*)XMLUni::fgUCS4LEncodingString,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4LEncodingString
@@ -291,7 +291,7 @@
gMappings->put
(
- (void*)XMLUni::fgUCS4LEncodingString2,
+ (void*)XMLUni::fgUCS4LEncodingString2,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4LEncodingString2
@@ -307,7 +307,7 @@
gMappingsRecognizer->setElementAt(new
EEndianNameMapFor<XMLUTF16Transcoder>(XMLUni::fgUTF16BEncodingString, swapped),
XMLRecognizer::UTF_16B);
gMappings->put
(
- (void*)XMLUni::fgUTF16BEncodingString,
+ (void*)XMLUni::fgUTF16BEncodingString,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16BEncodingString
@@ -317,7 +317,7 @@
gMappings->put
(
- (void*)XMLUni::fgUTF16BEncodingString2,
+ (void*)XMLUni::fgUTF16BEncodingString2,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16BEncodingString2
@@ -328,7 +328,7 @@
gMappingsRecognizer->setElementAt(new
EEndianNameMapFor<XMLUCS4Transcoder>(XMLUni::fgUCS4BEncodingString, swapped),
XMLRecognizer::UCS_4B);
gMappings->put
(
- (void*)XMLUni::fgUCS4BEncodingString,
+ (void*)XMLUni::fgUCS4BEncodingString,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4BEncodingString
@@ -338,7 +338,7 @@
gMappings->put
(
- (void*)XMLUni::fgUCS4BEncodingString2,
+ (void*)XMLUni::fgUCS4BEncodingString2,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4BEncodingString2
@@ -353,7 +353,7 @@
gMappings->put
(
- (void*)XMLUni::fgUTF16EncodingString,
+ (void*)XMLUni::fgUTF16EncodingString,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16EncodingString
@@ -362,7 +362,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUTF16EncodingString2,
+ (void*)XMLUni::fgUTF16EncodingString2,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16EncodingString2
@@ -371,7 +371,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUTF16EncodingString3,
+ (void*)XMLUni::fgUTF16EncodingString3,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16EncodingString3
@@ -380,7 +380,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUTF16EncodingString4,
+ (void*)XMLUni::fgUTF16EncodingString4,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16EncodingString4
@@ -389,7 +389,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUTF16EncodingString5,
+ (void*)XMLUni::fgUTF16EncodingString5,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16EncodingString5
@@ -398,7 +398,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUTF16EncodingString6,
+ (void*)XMLUni::fgUTF16EncodingString6,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16EncodingString6
@@ -407,7 +407,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUTF16EncodingString7,
+ (void*)XMLUni::fgUTF16EncodingString7,
new EEndianNameMapFor<XMLUTF16Transcoder>
(
XMLUni::fgUTF16EncodingString7
@@ -416,7 +416,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUCS4EncodingString,
+ (void*)XMLUni::fgUCS4EncodingString,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4EncodingString
@@ -425,7 +425,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUCS4EncodingString2,
+ (void*)XMLUni::fgUCS4EncodingString2,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4EncodingString2
@@ -434,7 +434,7 @@
);
gMappings->put
(
- (void*)XMLUni::fgUCS4EncodingString3,
+ (void*)XMLUni::fgUCS4EncodingString3,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4EncodingString3
@@ -443,13 +443,22 @@
);
gMappings->put
(
- (void*)XMLUni::fgUCS4EncodingString4,
+ (void*)XMLUni::fgUCS4EncodingString4,
new EEndianNameMapFor<XMLUCS4Transcoder>
(
XMLUni::fgUCS4EncodingString4
, false
)
);
+ gMappings->put
+ (
+ (void*)XMLUni::fgUCS4EncodingString5,
+ new EEndianNameMapFor<XMLUCS4Transcoder>
+ (
+ XMLUni::fgUCS4EncodingString5
+ , false
+ )
+ );
//
// Add in our mappings for IBM037, and the one alias we support for
Modified: xerces/c/trunk/src/xercesc/util/XMLUni.cpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUni.cpp?rev=710090&r1=710089&r2=710090&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUni.cpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUni.cpp Mon Nov 3 08:03:06 2008
@@ -361,6 +361,12 @@
chLatin_U, chLatin_T, chLatin_F, chDash, chDigit_3, chDigit_2, chNull
};
+const XMLCh XMLUni::fgUCS4EncodingString5[] =
+{
+ chLatin_I, chLatin_S, chLatin_O, chDash, chDigit_1, chDigit_0, chDigit_6,
chDigit_4, chDigit_6,
+ chDash, chLatin_U, chLatin_C, chLatin_S, chDash, chDigit_4, chNull
+};
+
const XMLCh XMLUni::fgUCS4BEncodingString[] =
{
chLatin_U, chLatin_C, chLatin_S, chDash, chDigit_4, chSpace, chOpenParen,
chLatin_B, chLatin_E, chCloseParen, chNull
Modified: xerces/c/trunk/src/xercesc/util/XMLUni.hpp
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/src/xercesc/util/XMLUni.hpp?rev=710090&r1=710089&r2=710090&view=diff
==============================================================================
--- xerces/c/trunk/src/xercesc/util/XMLUni.hpp (original)
+++ xerces/c/trunk/src/xercesc/util/XMLUni.hpp Mon Nov 3 08:03:06 2008
@@ -106,6 +106,7 @@
static const XMLCh fgUCS4EncodingString2[];
static const XMLCh fgUCS4EncodingString3[];
static const XMLCh fgUCS4EncodingString4[];
+ static const XMLCh fgUCS4EncodingString5[];
static const XMLCh fgUCS4BEncodingString[];
static const XMLCh fgUCS4BEncodingString2[];
static const XMLCh fgUCS4LEncodingString[];
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
