tng 2002/12/23 11:34:37
Modified: c/src/xercesc/internal XMLScanner.cpp
Log:
Fix: no need to check valid char in scancharref, the caller will check.
Revision Changes Path
1.31 +1 -23 xml-xerces/c/src/xercesc/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- XMLScanner.cpp 23 Dec 2002 17:53:50 -0000 1.30
+++ XMLScanner.cpp 23 Dec 2002 19:34:37 -0000 1.31
@@ -1724,28 +1724,6 @@
fReaderMgr.getNextChar();
}
- // [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] // any Unicode
character, excluding the
- // | [#xE000-#xFFFD] | [#x10000-#x10FFFF] // surrogate blocks,
FFFE, and FFFF.
- bool validChar = false;
- if (value < 0x20)
- {
- if (value == 0x09 || value == 0x0A || value == 0x0D)
- {
- validChar = true;
- }
- }
- else if (value <= 0xD7FF || (value >= 0xE000 && (value <= 0xFFFD || (value >=
0x10000 && value <= 0x10FFFF))))
- {
- validChar = true;
- }
-
- if (!validChar)
- {
- // Character reference was not in the valid range
- emitError(XMLErrs::InvalidCharacterRef);
- return false;
- }
-
// Return the char (or chars)
if (value >= 0x10000)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
