new version of muscle 3.8.31

[jabaws.git] / binaries / src / muscle / textfile.cpp

diff --git a/binaries/src/muscle/textfile.cpp b/binaries/src/muscle/textfile.cpp
index f58138b..dbe68e2 100644 (file)
--- a/binaries/src/muscle/textfile.cpp
+++ b/binaries/src/muscle/textfile.cpp
@@ -57,7 +57,9 @@ bool TextFile::GetLine(char szLine[], unsigned uBytes)
        if (0 == uBytes)\r
                Quit("TextFile::GetLine, buffer zero size");\r
 \r
-       memset(szLine, 0, uBytes);\r
+       \r
+       int FillVal = 0; // suppress warning from gcc that I don't understand\r
+       memset(szLine, FillVal, (size_t) uBytes);\r
 \r
        unsigned uBytesCopied = 0;\r
 \r
@@ -83,6 +85,8 @@ bool TextFile::GetLine(char szLine[], unsigned uBytes)
 // As GetLine, but trim leading and trailing blanks; skip empty lines\r
 bool TextFile::GetTrimLine(char szLine[], unsigned uBytes)\r
        {\r
+       if (uBytes == 0)\r
+               Quit("GetTrimLine");\r
        for (;;)\r
                {\r
                bool bEOF = GetLine(szLine, uBytes);\r
@@ -132,6 +136,8 @@ void TextFile::PutFormat(const char szFormat[], ...)
 \r
 void TextFile::GetLineX(char szLine[], unsigned uBytes)\r
        {\r
+       if (uBytes == 0)\r
+               Quit("GetLineX");\r
        bool bEof = GetLine(szLine, uBytes);\r
        if (bEof)\r
                Quit("end-of-file in GetLineX");\r