kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KWSys: Avoid passing string literal as char*

Browse Source 
Pass the lpClass argument of RegCreateKeyEx as a real char[] instead of
a string literal.  At least one platform declares the argument as char*
instead of "const char*".
This commit is contained in:
Brad King 2010-12-28 09:56:15 -05:00
parent 428e0e0ab9
commit 75191fa312
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/kwsys/Registry.cxx
View File

@ -401,8 +401,9 @@ bool RegistryHelper::Open(const char *toplevel, const char *subkey,
} }
else else
{ {
char lpClass[] = "";
res = ( RegCreateKeyEx(scope, str.str().c_str(), res = ( RegCreateKeyEx(scope, str.str().c_str(),
0, "", REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, 0, lpClass, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE,
NULL, &this->HKey, &dwDummy) == ERROR_SUCCESS ); NULL, &this->HKey, &dwDummy) == ERROR_SUCCESS );
} }
if ( res != 0 ) if ( res != 0 )

3
Source/kwsys/SystemTools.cxx
View File

@ -734,10 +734,11 @@ bool SystemTools::WriteRegistryValue(const char *key, const char *value,
HKEY hKey; HKEY hKey;
DWORD dwDummy; DWORD dwDummy;
char lpClass[] = "";
if(RegCreateKeyEx(primaryKey, if(RegCreateKeyEx(primaryKey,
second.c_str(), second.c_str(),
0, 0,
"", lpClass,
REG_OPTION_NON_VOLATILE, REG_OPTION_NON_VOLATILE,
SystemToolsMakeRegistryMode(KEY_WRITE, view), SystemToolsMakeRegistryMode(KEY_WRITE, view),
NULL, NULL,