dbertoni 2004/02/05 21:17:15
Modified: c/src/xalanc/XalanEXSLT XalanEXSLTString.cpp
Log:
Fixed operator precedence problems.
Revision Changes Path
1.7 +6 -6 xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp
Index: XalanEXSLTString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XalanEXSLTString.cpp 6 Jan 2004 02:41:42 -0000 1.6
+++ XalanEXSLTString.cpp 6 Feb 2004 05:17:15 -0000 1.7
@@ -547,7 +547,7 @@
theString[i+1],theString[i+2]);
i+=2;
- if (byte2 & 0x80 == 0)
+ if ((byte2 & 0x80) == 0)
{
// invalid byte, bypass rest of this sequence
i+= (numOctets - 2) * s_octetSize;
@@ -564,7 +564,7 @@
theString[i+1],theString[i+2]);
i+=2;
- if (byte2 & 0x80 == 0 || byte3 & 0x80 == 0)
+ if ((byte2 & 0x80) == 0 || (byte3 & 0x80) == 0)
{
// invalid byte, bypass rest of this sequence
i+= (numOctets - 3) * s_octetSize;
@@ -584,7 +584,7 @@
theString[i+1],theString[i+2]);
i+=2;
- if (byte2 & 0x80 == 0 || byte3 & 0x80 == 0 || byte4 &
0x80 == 0)
+ if ((byte2 & 0x80) == 0 || (byte3 & 0x80) == 0 ||
(byte4 & 0x80) == 0)
{
// invalid byte, bypass rest of this sequence
i+= (numOctets - 4) * s_octetSize;
@@ -616,17 +616,17 @@
XalanDOMChar curChar = lowHexChar;
for (int place = 0; place < 2; ++place)
{
- if ( curChar >= XalanUnicode::charDigit_0
+ if (curChar >= XalanUnicode::charDigit_0
&& curChar <= XalanUnicode::charDigit_9) // Digit
{
byte += XalanDOMChar((curChar -
XalanUnicode::charDigit_0) << (place * 4));
}
- else if ( curChar >= XalanUnicode::charLetter_A
+ else if (curChar >= XalanUnicode::charLetter_A
&& curChar <= XalanUnicode::charLetter_F) //
Uppercase
{
byte += XalanDOMChar((curChar -
XalanUnicode::charLetter_A + 10) << (place * 4));
}
- else if ( curChar >= XalanUnicode::charLetter_a
+ else if (curChar >= XalanUnicode::charLetter_a
&& curChar <= XalanUnicode::charLetter_f) //
Lowercase
{
byte += XalanDOMChar((curChar -
XalanUnicode::charLetter_a + 10) << place);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
