diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-05 02:01:42 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2003-03-05 02:01:42 +0000 |
| commit | d6669a52731be557172e60644719aa701addc38a (patch) | |
| tree | 622eee0b11833e496c397b59f052828a55443d6a | |
| parent | 6cc956951944be1bb46c5b1a77e03ff814a87aec (diff) | |
| download | ATCD-d6669a52731be557172e60644719aa701addc38a.tar.gz | |
ChangeLogTag:Tue Mar 04 19:58:29 2003 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | ACEXML/common/FileCharStream.cpp | 2 | ||||
| -rw-r--r-- | ACEXML/common/LocatorImpl.cpp | 2 | ||||
| -rw-r--r-- | ACEXML/parser/parser/Parser.i | 2 | ||||
| -rw-r--r-- | ChangeLog | 11 |
4 files changed, 15 insertions, 2 deletions
diff --git a/ACEXML/common/FileCharStream.cpp b/ACEXML/common/FileCharStream.cpp index 5f3a5952ae9..5b989173d2e 100644 --- a/ACEXML/common/FileCharStream.cpp +++ b/ACEXML/common/FileCharStream.cpp @@ -60,7 +60,7 @@ ACEXML_FileCharStream::determine_encoding (void) else { this->encoding_ = ACE::strnew (temp); - ACE_DEBUG ((LM_DEBUG, "File's encoding is %s\n", this->encoding_)); +// ACE_DEBUG ((LM_DEBUG, "File's encoding is %s\n", this->encoding_)); } // Move over the byte-order-mark if present. char ch; diff --git a/ACEXML/common/LocatorImpl.cpp b/ACEXML/common/LocatorImpl.cpp index d304092e9fc..0ccf9c1773a 100644 --- a/ACEXML/common/LocatorImpl.cpp +++ b/ACEXML/common/LocatorImpl.cpp @@ -31,7 +31,9 @@ void ACEXML_LocatorImpl::reset (void) { delete[] this->publicId_; + this->publicId_ = 0; delete[] this->systemId_; + this->systemId_ = 0; this->columnNumber_ = 0; this->lineNumber_ = 1; } diff --git a/ACEXML/parser/parser/Parser.i b/ACEXML/parser/parser/Parser.i index c483898ec85..c346c99471d 100644 --- a/ACEXML/parser/parser/Parser.i +++ b/ACEXML/parser/parser/Parser.i @@ -115,7 +115,7 @@ ACEXML_Parser::get (void) if (this->instream_ != 0) { ACEXML_Char ch; - if (this->instream_->get (ch) == -1) + if (this->instream_->get (ch) == -1) // EOF reached. return 0; this->locator_.incrColumnNumber(); if (ch == 0x0A) { diff --git a/ChangeLog b/ChangeLog index 06d2fcfe6eb..228eb021188 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Mar 04 19:58:29 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * ACEXML/common/FileCharStream.cpp (determine_encoding): Commented + out the annoying debug information. Users should get the + encoding information from this->getEncoding(), instead of + relying on the debug info. + + * ACEXML/common/LocatorImpl.cpp (reset): Remember to reset string + pointers to 0 after deleteing them. Otherwise, a parser may + crash if it is used to parse a second file. + Tue Mar 4 17:39:31 2003 Steve Huston <shuston@riverace.com> * docs/CE-status.txt: Updated to reflect the ACE 5.3 status of CE. |