knoaman 2003/01/27 08:50:28
Modified: c/src/xercesc/internal XMLReader.hpp
Log:
some cleanup.
Revision Changes Path
1.12 +10 -16 xml-xerces/c/src/xercesc/internal/XMLReader.hpp
Index: XMLReader.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLReader.hpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XMLReader.hpp 20 Dec 2002 22:09:56 -0000 1.11
+++ XMLReader.hpp 27 Jan 2003 16:50:27 -0000 1.12
@@ -56,6 +56,9 @@
/*
* $Log$
+ * Revision 1.12 2003/01/27 16:50:27 knoaman
+ * some cleanup.
+ *
* Revision 1.11 2002/12/20 22:09:56 tng
* XML 1.1
*
@@ -755,16 +758,7 @@
// See if there is at least a char in the buffer. Else, do the buffer
// reload logic.
//
- if (fCharIndex < fCharsAvail)
- {
- // Check the next char
- if (fCharBuf[fCharIndex] == chNotToGet)
- return false;
-
- // Its not the one we want to skip so bump the index
- chGotten = fCharBuf[fCharIndex++];
- }
- else
+ if (fCharIndex >= fCharsAvail)
{
// If fNoMore is set, then we have nothing else to give
if (fNoMore)
@@ -773,14 +767,14 @@
// Try to refresh
if (!refreshCharBuffer())
return false;
+ }
- // Check the next char
- if (fCharBuf[fCharIndex] == chNotToGet)
- return false;
+ // Check the next char
+ if (fCharBuf[fCharIndex] == chNotToGet)
+ return false;
- // Its not the one we want to skip so bump the index
- chGotten = fCharBuf[fCharIndex++];
- }
+ // Its not the one we want to skip so bump the index
+ chGotten = fCharBuf[fCharIndex++];
// Handle end of line normalization and line/col member maintenance.
if (chGotten == chCR)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
