From bb130e5395d472c8ce23012c8234b32ca38fa460 Mon Sep 17 00:00:00 2001 From: Zack Rusin Date: Sat, 6 Aug 2011 18:58:39 -0400 Subject: [PATCH] gets returns an int --- trace_file.cpp | 6 +++--- trace_file.hpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/trace_file.cpp b/trace_file.cpp index 4bba837..4c6c8eb 100644 --- a/trace_file.cpp +++ b/trace_file.cpp @@ -84,7 +84,7 @@ void File::flush() rawFlush(); } -char File::getc() +int File::getc() { if (!m_isOpened || m_mode != File::Read) { return 0; @@ -120,7 +120,7 @@ bool ZLibFile::rawRead(void *buffer, int length) return gzread(m_gzFile, buffer, length) != -1; } -char ZLibFile::rawGetc() +int ZLibFile::rawGetc() { return gzgetc(m_gzFile); } @@ -243,7 +243,7 @@ bool SnappyFile::rawRead(void *buffer, int length) return true; } -char SnappyFile::rawGetc() +int SnappyFile::rawGetc() { char c; rawRead(&c, 1); diff --git a/trace_file.hpp b/trace_file.hpp index 5a460f7..7e7f9bd 100644 --- a/trace_file.hpp +++ b/trace_file.hpp @@ -26,13 +26,13 @@ public: bool read(void *buffer, int length); void close(); void flush(); - char getc(); + int getc(); protected: virtual bool rawOpen(const std::string &filename, File::Mode mode) = 0; virtual bool rawWrite(const void *buffer, int length) = 0; virtual bool rawRead(void *buffer, int length) = 0; - virtual char rawGetc() = 0; + virtual int rawGetc() = 0; virtual void rawClose() = 0; virtual void rawFlush() = 0; @@ -52,7 +52,7 @@ protected: virtual bool rawOpen(const std::string &filename, File::Mode mode); virtual bool rawWrite(const void *buffer, int length); virtual bool rawRead(void *buffer, int length); - virtual char rawGetc(); + virtual int rawGetc(); virtual void rawClose(); virtual void rawFlush(); private: @@ -74,7 +74,7 @@ protected: virtual bool rawOpen(const std::string &filename, File::Mode mode); virtual bool rawWrite(const void *buffer, int length); virtual bool rawRead(void *buffer, int length); - virtual char rawGetc(); + virtual int rawGetc(); virtual void rawClose(); virtual void rawFlush(); -- 2.43.0