From dffc1741d9e0927ec8beb6914335e399c5ba5128 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Fri, 17 Feb 2012 14:27:22 -0600 Subject: [PATCH] Fixes for variable shadowing (8/28) --- src/csv.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/csv.cc b/src/csv.cc index 87f37ad1..e32a0b87 100644 --- a/src/csv.cc +++ b/src/csv.cc @@ -80,17 +80,17 @@ string csv_reader::read_field(std::istream& sin) return field; } -char * csv_reader::next_line(std::istream& in) +char * csv_reader::next_line(std::istream& sin) { static char linebuf[MAX_LINE + 1]; - while (in.good() && ! in.eof() && in.peek() == '#') - in.getline(linebuf, MAX_LINE); + while (sin.good() && ! sin.eof() && sin.peek() == '#') + sin.getline(linebuf, MAX_LINE); - if (! in.good() || in.eof()) + if (! sin.good() || sin.eof()) return NULL; - in.getline(linebuf, MAX_LINE); + sin.getline(linebuf, MAX_LINE); return linebuf; }