BUG: Remove warning and try to fix memory problem

This commit is contained in:
Andy Cedilnik 2005-09-19 16:19:57 -04:00
parent 5f2343bf91
commit ec36660ca8
1 changed files with 6 additions and 5 deletions

View File

@ -367,6 +367,11 @@ RegistryHelper::~RegistryHelper()
bool RegistryHelper::Open(const char *toplevel, const char *subkey, bool RegistryHelper::Open(const char *toplevel, const char *subkey,
int readonly) int readonly)
{ {
this->EntriesMap.erase(
this->EntriesMap.begin(),
this->EntriesMap.end());
m_Empty = 1;
#ifdef _WIN32 #ifdef _WIN32
if ( m_RegistryType == Registry::WIN32_REGISTRY) if ( m_RegistryType == Registry::WIN32_REGISTRY)
{ {
@ -493,10 +498,6 @@ bool RegistryHelper::Close()
{ {
if ( !m_Changed ) if ( !m_Changed )
{ {
this->EntriesMap.erase(
this->EntriesMap.begin(),
this->EntriesMap.end());
m_Empty = 1;
this->SetSubKey(0); this->SetSubKey(0);
return true; return true;
} }
@ -786,7 +787,7 @@ kwsys_stl::string RegistryHelper::DecodeValue(const char* str)
kwsys_ios::ostringstream ostr; kwsys_ios::ostringstream ostr;
while ( *str ) while ( *str )
{ {
int val; unsigned int val;
switch ( *str ) switch ( *str )
{ {
case '%': case '%':