RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

accept MS-DOS end-of-line characters

This commit is contained in:
David Rose 2003-06-02 21:52:58 +00:00
parent 5fea988239
commit 1e0d35082d
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
panda/src/chancfg/chanparse.cxx
View File

@ -23,7 +23,7 @@ const int ChanFileEOF = -1;
static bool file_done;
INLINE std::string ChanReadLine(istream& is) {
std::string ChanReadLine(istream& is) {
if (is.eof() || is.fail())
#ifdef BROKEN_EXCEPTIONS
{
@ -43,6 +43,9 @@ INLINE std::string ChanReadLine(istream& is) {
i = S.find_first_of(";");
if (i != std::string::npos)
S.erase(i, std::string::npos); // remove trailing comment
i = S.find_last_not_of(" \t\f\r\n");
if (i != std::string::npos)
S.erase(i + 1, std::string::npos); // remove trailing whitespace
return S;
}