mirrors/aria2
1
0
Fork 0
mirror of https://github.com/aria2/aria2.git synced 2025-04-06 05:57:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Removed feof from operator unspecified_bool_type. Added eof().

Browse source 
In BufferedFile, removed feof from operator unspecified_bool_type. EOF
can be queried separately using newly added eof().
This commit is contained in:
Tatsuhiro Tsujikawa 2011-08-07 00:06:32 +09:00
parent f6472abae8
commit 7f3d027b83
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/BufferedFile.cc
View file

@ -57,7 +57,7 @@ BufferedFile::~BufferedFile()
BufferedFile::operator unspecified_bool_type() const BufferedFile::operator unspecified_bool_type() const
{ {
return (!open_ || ferror(fp_) || feof(fp_)) ? 0 : &BufferedFile::good_state; return (!open_ || ferror(fp_)) ? 0 : &BufferedFile::good_state;
} }
size_t BufferedFile::read(void* ptr, size_t count) size_t BufferedFile::read(void* ptr, size_t count)
@ -97,4 +97,9 @@ int BufferedFile::close()
} }
} }
bool BufferedFile::eof()
{
return open_ && feof(fp_);
}
} // namespace aria2 } // namespace aria2

2
src/BufferedFile.h
View file

@ -63,6 +63,8 @@ public:
char* getsn(char* s, int size); char* getsn(char* s, int size);
// wrapper for fclose // wrapper for fclose
int close(); int close();
// Return true if open_ && feof(fp_) != 0. Otherwise returns false.
bool eof();
// Mode for reading // Mode for reading
static const std::string READ; static const std::string READ;
// Mode for writing // Mode for writing

2
test/BufferedFileTest.cc
View file

@ -52,7 +52,7 @@ void BufferedFileTest::testOpen()
CPPUNIT_ASSERT(rd.getsn(buf, sizeof(buf))); CPPUNIT_ASSERT(rd.getsn(buf, sizeof(buf)));
CPPUNIT_ASSERT_EQUAL(std::string("charlie"), std::string(buf)); CPPUNIT_ASSERT_EQUAL(std::string("charlie"), std::string(buf));
CPPUNIT_ASSERT(!rd); CPPUNIT_ASSERT(rd.eof());
} }
} // namespace aria2 } // namespace aria2