summaryrefslogtreecommitdiff
path: root/hwpfilter
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-06-13 21:26:18 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-06-13 21:26:18 +0100
commit20a1afe407e4b592c787965b85ecfa8ddfd333de (patch)
tree56a5b0ab25c98fd9552913a24aac4808d8682ee4 /hwpfilter
parent3de0e85039f72f8506213369e262a4837ae88d98 (diff)
valgrind: linenumber uninited
Diffstat (limited to 'hwpfilter')
-rw-r--r--hwpfilter/source/hwpfile.cpp36
-rw-r--r--hwpfilter/source/hwpfile.h9
2 files changed, 16 insertions, 29 deletions
diff --git a/hwpfilter/source/hwpfile.cpp b/hwpfilter/source/hwpfile.cpp
index 2b1bde79f7d1..b77cc1dad25f 100644
--- a/hwpfilter/source/hwpfile.cpp
+++ b/hwpfilter/source/hwpfile.cpp
@@ -54,16 +54,26 @@ static int ccount = 0;
static int pcount = 0;
static int datecodecount = 0;
-HWPFile::HWPFile(void)
+HWPFile::HWPFile()
+ : version(HWP_V30)
+ , compressed(false)
+ , encrypted(false)
+ , linenumber(0)
+ , info_block_len(0)
+ , error_code(HWP_NoError)
+ , oledata(0)
+ , m_nCurrentPage(1)
+ , m_nMaxSettedPage(0)
+ , hiodev(0)
+ , currenthyper(0)
{
- Init();
+ SetCurrentDoc(this);
}
-
/**
* TODO : ߰ ŸϸƮ ޸
*/
-HWPFile::~HWPFile(void)
+HWPFile::~HWPFile()
{
if (oledata)
delete oledata;
@@ -90,24 +100,6 @@ HWPFile::~HWPFile(void)
}
}
-
-void HWPFile::Init(void)
-{
- version = HWP_V30;
- info_block_len = 0;
- compressed = false;
- encrypted = false;
-
- error_code = HWP_NoError;
- hiodev = 0;
- oledata = 0;
- SetCurrentDoc(this);
- currenthyper = 0;
- m_nCurrentPage = 1;
- m_nMaxSettedPage = 0;
-}
-
-
int HWPFile::ReadHwpFile(HStream & stream)
{
if (Open(stream) != HWP_NoError)
diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h
index 78cdbab0b99f..8f71c4aa0d08 100644
--- a/hwpfilter/source/hwpfile.h
+++ b/hwpfilter/source/hwpfile.h
@@ -109,15 +109,10 @@ class DLLEXPORT HWPFile
/**
* Default constructor
*/
- HWPFile( void );
-
- ~HWPFile( void );
+ HWPFile();
+ ~HWPFile();
public:
-/**
- * Initialize this object
- */
- void Init();
/**
* Opens HStream to use it.