diff options
author | John Wiegley <johnw@newartisans.com> | 2012-02-17 14:27:22 -0600 |
---|---|---|
committer | John Wiegley <johnw@newartisans.com> | 2012-02-17 15:06:05 -0600 |
commit | dffc1741d9e0927ec8beb6914335e399c5ba5128 (patch) | |
tree | 0f8765a4ea2bceecab3e2a521400e7b9f439370f /src | |
parent | cc40beca462626a806518bb399cfa777c2fcef8f (diff) | |
download | ledger-dffc1741d9e0927ec8beb6914335e399c5ba5128.tar.gz ledger-dffc1741d9e0927ec8beb6914335e399c5ba5128.tar.bz2 ledger-dffc1741d9e0927ec8beb6914335e399c5ba5128.zip |
Fixes for variable shadowing (8/28)
Diffstat (limited to 'src')
-rw-r--r-- | src/csv.cc | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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; } |