diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-05-23 23:28:08 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-05-23 23:28:08 +0900 |
| commit | bc3b162569e9300c3dc7b4aa942abc17ac7216b6 (patch) | |
| tree | 3b426dcffa23c78035b4462a46bd1f0258ab94f3 /src/BufferedFile.cc | |
| parent | b0799b6e4627ca7ad483c49e04f17bd40c8feae0 (diff) | |
Remove open_ member from BufferedFile and GZipFile
Just checking fp_ is sufficient.
Diffstat (limited to 'src/BufferedFile.cc')
| -rw-r--r-- | src/BufferedFile.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/BufferedFile.cc b/src/BufferedFile.cc index 44ea076e..1342c125 100644 --- a/src/BufferedFile.cc +++ b/src/BufferedFile.cc @@ -50,12 +50,11 @@ BufferedFile::BufferedFile(const char* filename, const char* mode) #else // !__MINGW32__ fp_(a2fopen(filename, mode)), #endif // !__MINGW32__ - open_(fp_), supportsColor_(fp_ ? isatty(fileno(fp_)) : false) {} BufferedFile::BufferedFile(FILE* fp) - : fp_(fp), open_(fp_), supportsColor_(fp_ ? isatty(fileno(fp_)) : false) + : fp_(fp), supportsColor_(fp_ ? isatty(fileno(fp_)) : false) {} BufferedFile::~BufferedFile() @@ -80,11 +79,12 @@ char* BufferedFile::onGets(char* s, int size) int BufferedFile::onClose() { - if (open_) { - open_ = false; - return fclose(fp_); + int rv = 0; + if (fp_) { + rv = fclose(fp_); + fp_ = 0; } - return 0; + return rv; } int BufferedFile::onVprintf(const char* format, va_list va) @@ -114,7 +114,7 @@ bool BufferedFile::isEOF() const bool BufferedFile::isOpen() const { - return open_; + return fp_; } } // namespace aria2 |