ChangeLogTag: Wed Aug 21 20:40:20 2002 Krishnakumar B <kitty@cs.wustl.edu>

3 files changed, 9 insertions, 11 deletions

diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp
index 885ba18f0ad..1f66991c884 100644
--- a/ACEXML/common/FileCharStream.cpp
+++ b/ACEXML/common/FileCharStream.cpp
@@ -22,7 +22,7 @@ ACEXML_FileCharStream::open (const ACEXML_Char *name)
   delete[] this->filename_;
   this->filename_ = 0;
 
-  this->infile_ = ACE_OS::fopen (name, ACE_LIB_TEXT ("r"));
+  this->infile_ = ACE_OS::fopen (name, ACE_TEXT ("r"));
   if (this->infile_ == NULL)
     return -1;
 
@@ -58,10 +58,8 @@ ACEXML_FileCharStream::close (void)
 int
 ACEXML_FileCharStream::get (ACEXML_Char& ch)
 {
-  // @@ Error checking?
-  ch = (unsigned char) fgetc (this->infile_);
-
-  return (((char) ch) == EOF ? -1 :0);
+  ch = (ACEXML_Char) ACE_OS::fgetc (this->infile_);
+  return (ACE_OS::feof(this->infile_) ? -1 : 0);
 }
 
 int
@@ -74,7 +72,7 @@ ACEXML_FileCharStream::read (ACEXML_Char *str,
 int
 ACEXML_FileCharStream::peek (void)
 {
-  ACEXML_Char ch = ::fgetc (this->infile_);
-  ::ungetc (ch, this->infile_);
+  ACEXML_Char ch = ACE_OS::fgetc (this->infile_);
+  ACE_OS::ungetc (ch, this->infile_);
   return ch;
 }
diff --git a/ACEXML/common/HttpCharStream.cpp b/ACEXML/common/HttpCharStream.cpp
index 9377fc5c4e0..beeb6806390 100644
--- a/ACEXML/common/HttpCharStream.cpp
+++ b/ACEXML/common/HttpCharStream.cpp
@@ -267,8 +267,8 @@ ACEXML_HttpCharStream::close (void)
 int
 ACEXML_HttpCharStream::get (ACEXML_Char& ch)
 {
-  ch = (unsigned char) this->stream_->get_char();
-  return (((char) ch) == EOF ? -1 :0);
+  ch = (ACEXML_Char) this->stream_->get_char();
+  return (ch == (ACEXML_Char)EOF ? -1 :0);
 }
 
 int
diff --git a/ACEXML/common/XMLFilterImpl.cpp b/ACEXML/common/XMLFilterImpl.cpp
index c1b70a2cad1..464ac531f08 100644
--- a/ACEXML/common/XMLFilterImpl.cpp
+++ b/ACEXML/common/XMLFilterImpl.cpp
@@ -38,7 +38,7 @@ ACEXML_XMLFilterImpl::parse (ACEXML_InputSource *input,
 {
   if (this->setupParser () < 0)
     {
-      xmlenv.exception (new ACEXML_SAXException (ACE_LIB_TEXT ("No Parent available")));
+      xmlenv.exception (new ACEXML_SAXException (ACE_TEXT ("No Parent available")));
       return;
     }
   this->parent_->parse (input, xmlenv);
@@ -52,7 +52,7 @@ ACEXML_XMLFilterImpl::parse (const ACEXML_Char *systemId,
 {
   if (this->setupParser () < 0)
     {
-      xmlenv.exception (new ACEXML_SAXException (ACE_LIB_TEXT ("No Parent available")));
+      xmlenv.exception (new ACEXML_SAXException (ACE_TEXT ("No Parent available")));
       return;
     }