diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-16 09:13:53 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-16 09:13:53 +0200 |
commit | b755094c831d449aba37eaf53e4f6e28b9ee5ad9 (patch) | |
tree | f4d24d9338f3395e52887b6f03311a223717fbdd /hwpfilter/source | |
parent | 96e9ffa64706f523d67659a20a0ccce6fbd0cb91 (diff) |
No need for an abstaract HIODev::close
...that was only called from dtors anyway, where its virtual-ness doesn't
actually help (and would trigger loplugin:fragiledestructor if that were
enabled)
Change-Id: I477a22f2cadd1124b7106c5338e525629968a284
Diffstat (limited to 'hwpfilter/source')
-rw-r--r-- | hwpfilter/source/hiodev.cxx | 22 | ||||
-rw-r--r-- | hwpfilter/source/hiodev.h | 10 |
2 files changed, 7 insertions, 25 deletions
diff --git a/hwpfilter/source/hiodev.cxx b/hwpfilter/source/hiodev.cxx index a5e035741dbb..98001e99a6a8 100644 --- a/hwpfilter/source/hiodev.cxx +++ b/hwpfilter/source/hiodev.cxx @@ -116,7 +116,11 @@ HStreamIODev::HStreamIODev(HStream * stream):_stream(stream) HStreamIODev::~HStreamIODev() { - close(); +/* 플러시한 후 닫는다. */ + this->flush(); + if (_gzfp) + gz_close(_gzfp); + _gzfp = nullptr; } @@ -142,16 +146,6 @@ void HStreamIODev::flush() } -void HStreamIODev::close() -{ -/* 플러시한 후 닫는다. */ - this->flush(); - if (_gzfp) - gz_close(_gzfp); - _gzfp = nullptr; -} - - int HStreamIODev::state() const { return 0; @@ -272,7 +266,6 @@ HMemIODev::HMemIODev(char *s, int len) HMemIODev::~HMemIODev() { - close(); } @@ -295,11 +288,6 @@ void HMemIODev::flush() } -void HMemIODev::close() -{ -} - - int HMemIODev::state() const { if (pos <= length) diff --git a/hwpfilter/source/hiodev.h b/hwpfilter/source/hiodev.h index b30a79f843c4..ab90435de58c 100644 --- a/hwpfilter/source/hiodev.h +++ b/hwpfilter/source/hiodev.h @@ -46,7 +46,6 @@ class DLLEXPORT HIODev virtual ~HIODev(); virtual bool open() = 0; - virtual void close() = 0; virtual void flush() = 0; virtual int state() const = 0; /* gzip routine wrapper */ @@ -73,7 +72,7 @@ struct gz_stream; * This controls the HStream given by constructor * @short Stream IO device */ -class HStreamIODev : public HIODev +class HStreamIODev final: public HIODev { private: /* zlib으로 압축을 풀기 위한 자료 구조 */ @@ -87,10 +86,6 @@ class HStreamIODev : public HIODev */ virtual bool open() override; /** - * Free stream object - */ - virtual void close() override; -/** * If the stream is gzipped, flush the stream. */ virtual void flush() override; @@ -139,7 +134,7 @@ class HStreamIODev : public HIODev * The HMemIODev class controls the Input/Output device. * @short Memory IO device */ -class HMemIODev : public HIODev +class HMemIODev final: public HIODev { uchar *ptr; int pos, length; @@ -148,7 +143,6 @@ class HMemIODev : public HIODev virtual ~HMemIODev() override; virtual bool open() override; - virtual void close() override; virtual void flush() override; virtual int state() const override; /* gzip routine wrapper */ |