diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-09-16 17:56:09 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-09-16 17:56:09 (GMT) |
| commit | 767057f37fa6ce196b15ee2243a1d409b33ba893 (patch) | |
| tree | 1a4756eb33488182cbbf42a81dfdd3013f42e4d9 /Source/kwsys | |
| parent | 9b486bacfc98d6878b0e48f0136653c98cc5b385 (diff) | |
| download | CMake-767057f37fa6ce196b15ee2243a1d409b33ba893.zip CMake-767057f37fa6ce196b15ee2243a1d409b33ba893.tar.gz CMake-767057f37fa6ce196b15ee2243a1d409b33ba893.tar.bz2 | |
BUG: Fix encoding and add deleting to the test
Diffstat (limited to 'Source/kwsys')
| -rw-r--r-- | Source/kwsys/Registry.cxx | 6 | ||||
| -rw-r--r-- | Source/kwsys/testRegistry.cxx | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Source/kwsys/Registry.cxx b/Source/kwsys/Registry.cxx index 245e3ef..a15a12a 100644 --- a/Source/kwsys/Registry.cxx +++ b/Source/kwsys/Registry.cxx @@ -525,7 +525,7 @@ bool RegistryHelper::Close() it != this->EntriesMap.end(); ++ it ) { - *ofs << it->first.c_str() << " = " << it->second.c_str()<< kwsys_ios::endl; + *ofs << it->first.c_str() << " = " << this->EncodeValue(it->second.c_str()).c_str() << kwsys_ios::endl; } } this->EntriesMap.erase( @@ -660,7 +660,7 @@ bool RegistryHelper::SetValue(const char *skey, const char *value) { return 0; } - this->EntriesMap[key] = this->EncodeValue(value); + this->EntriesMap[key] = value; return 1; } return false; @@ -744,7 +744,7 @@ kwsys_stl::string RegistryHelper::EncodeKey(const char* str) { switch ( *str ) { - case '%': case '=': case '\n': case '\r': case '\t': case ' ': + case '%': case '=': case '\n': case '\r': case '\t': char buffer[4]; sprintf(buffer, "%%%02X", *str); ostr << buffer; diff --git a/Source/kwsys/testRegistry.cxx b/Source/kwsys/testRegistry.cxx index 6906dac..b808f11 100644 --- a/Source/kwsys/testRegistry.cxx +++ b/Source/kwsys/testRegistry.cxx @@ -35,7 +35,7 @@ kwsys_ios::cout << "Error in: " << #x << kwsys_ios::endl; \ } -#define CHE(x,y,res) if ( strcmp(x,y) ) \ +#define CHE(x,y,res) if ( x && y && strcmp(x,y) ) \ { \ res = 1; \ kwsys_ios::cout << "Error, " << x << " != " << y << kwsys_ios::endl; \ @@ -90,10 +90,14 @@ int main(int, char**) IFT(reg.SetValue("TestSubkeyWithVeryLongInFactSoLongItsHardToImagineAnybodyWouldReallyDoItLongName", "TestKey1", longStringWithNewLines), res); IFT(reg.ReadValue("TestSubkeyWithVeryLongInFactSoLongItsHardToImagineAnybodyWouldReallyDoItLongName", "TestKey1", &buffer), res); CHE(buffer, longStringWithNewLines, res); + IFT(reg.DeleteValue("TestSubkeyWithVeryLongInFactSoLongItsHardToImagineAnybodyWouldReallyDoItLongName", "TestKey1"), res); + IFNT(reg.ReadValue("TestSubkeyWithVeryLongInFactSoLongItsHardToImagineAnybodyWouldReallyDoItLongName", "TestKey1", &buffer), res); IFT(reg.SetValue("TestSubkeyWith = EqualSignChar", "TestKey = 1", "Some value"), res); IFT(reg.ReadValue("TestSubkeyWith = EqualSignChar", "TestKey = 1", &buffer), res); CHE(buffer, "Some value", res); + IFT(reg.DeleteValue("TestSubkeyWith = EqualSignChar", "TestKey = 1"), res); + IFNT(reg.ReadValue("TestSubkeyWith = EqualSignChar", "TestKey = 1", &buffer), res); if ( res ) { |