ChangeLogTag: Tue Aug 5 18:51:02 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu>

3 files changed, 16 insertions, 9 deletions

diff --git a/ACE/ACEXML/common/HttpCharStream.cpp b/ACE/ACEXML/common/HttpCharStream.cpp
index ab0d9a0eed8..f94a2bed1a1 100644
--- a/ACE/ACEXML/common/HttpCharStream.cpp
+++ b/ACE/ACEXML/common/HttpCharStream.cpp
@@ -114,13 +114,16 @@ int
 ACEXML_HttpCharStream::get_url (size_t& len)
 {
   if (this->stream_ == 0)
-    return -1;
+    {
+      return -1;
+    }
 
   int header_state = HDST_LINE1_PROTOCOL;
   int status = 0;
   size_t b = 0;
   char const * buf = 0;
   size_t buflen = BUFSIZ;
+  
   for (;;)
     {
       buf = this->stream_->recv (buflen);
diff --git a/ACE/ACEXML/common/ZipCharStream.cpp b/ACE/ACEXML/common/ZipCharStream.cpp
index 4de9dc33abd..7775dc6a39e 100644
--- a/ACE/ACEXML/common/ZipCharStream.cpp
+++ b/ACE/ACEXML/common/ZipCharStream.cpp
@@ -57,7 +57,8 @@ ACEXML_ZipCharStream::determine_encoding (void)
 //                   this->encoding_));
     }
   // Move over the byte-order-mark if present.
-  char ch;
+  int ch;
+  
   for (int j = 0; j < 3; ++j)
     {
       if ((ch = this->peekchar_i()) < 0)
@@ -68,6 +69,7 @@ ACEXML_ZipCharStream::determine_encoding (void)
       else
         break;
     }
+    
   return 0;
 }
 
diff --git a/ACE/ACEXML/parser/parser/Parser.inl b/ACE/ACEXML/parser/parser/Parser.inl
index 1706d0a88e1..9af33326cf0 100644
--- a/ACE/ACEXML/parser/parser/Parser.inl
+++ b/ACE/ACEXML/parser/parser/Parser.inl
@@ -59,17 +59,19 @@ ACEXML_Parser::setErrorHandler (ACEXML_ErrorHandler *handler)
 ACEXML_INLINE int
 ACEXML_Parser::isChar (ACEXML_UCS4 c) const
 {
-  return (c == 0x9 || c == 0xA || c == 0xD ||
-          c >= 0x20 && c <= 0xD7FF ||
-          c >= 0xE000 && c <= 0xFFFD ||
-          c >= 0x10000 && c <= 0x10FFFF);
+  return (c == 0x9
+          || c == 0xA
+          || c == 0xD
+          || (c >= 0x20 && c <= 0xD7FF)
+          || (c >= 0xE000 && c <= 0xFFFD)
+          || (c >= 0x10000 && c <= 0x10FFFF));
 }
 
 ACEXML_INLINE int
 ACEXML_Parser::isCharRef (const ACEXML_Char c) const
-    {
-  return ((c >= 'a' && c <= 'f') ||
-          (c >= 'A' && c <= 'F'));
+{
+  return ((c >= 'a' && c <= 'f')
+          || (c >= 'A' && c <= 'F'));
 }
 
 ACEXML_INLINE int