One more cppcheck warning.

This commit is contained in:
Mathew Sutcliffe
2014-11-18 01:19:51 +00:00
parent 4f342fade6
commit b43d631697

View File

@@ -172,8 +172,6 @@ bool DoPackageSub(std::string& ioPath)
char * fgets_multiplatform(char * s, int n, FILE * file) char * fgets_multiplatform(char * s, int n, FILE * file)
{ {
char * p = s; char * p = s;
int c;
int c1;
// Save one slot for the null. If we do not have enough memory // Save one slot for the null. If we do not have enough memory
// to do this, bail. // to do this, bail.
@@ -183,6 +181,7 @@ char * fgets_multiplatform(char * s, int n, FILE * file)
// Only bother to read if we have enough space in the char buf. // Only bother to read if we have enough space in the char buf.
if (n) if (n)
{ {
int c;
do do
{ {
c = getc(file); c = getc(file);
@@ -210,12 +209,12 @@ char * fgets_multiplatform(char * s, int n, FILE * file)
// just the first. // just the first.
if (c == '\r') if (c == '\r')
{ {
c1 = getc(file); int c1 = getc(file);
if (c1 != '\n') ungetc(c1, file); if (c1 != '\n') ungetc(c1, file);
} }
if (c == '\n') if (c == '\n')
{ {
c1 = getc(file); int c1 = getc(file);
if (c1 != '\r') ungetc(c1, file); if (c1 != '\r') ungetc(c1, file);
} }
} }