Fixes for variable shadowing (8/28)

This commit is contained in:
John Wiegley 2012-02-17 14:27:22 -06:00
parent cc40beca46
commit dffc1741d9

View file

@ -80,17 +80,17 @@ string csv_reader::read_field(std::istream& sin)
return field; return field;
} }
char * csv_reader::next_line(std::istream& in) char * csv_reader::next_line(std::istream& sin)
{ {
static char linebuf[MAX_LINE + 1]; static char linebuf[MAX_LINE + 1];
while (in.good() && ! in.eof() && in.peek() == '#') while (sin.good() && ! sin.eof() && sin.peek() == '#')
in.getline(linebuf, MAX_LINE); sin.getline(linebuf, MAX_LINE);
if (! in.good() || in.eof()) if (! sin.good() || sin.eof())
return NULL; return NULL;
in.getline(linebuf, MAX_LINE); sin.getline(linebuf, MAX_LINE);
return linebuf; return linebuf;
} }