Bläddra i källkod

Avoid passing string literal to char* type

Brad King 15 år sedan
förälder
incheckning
0bb22cfabe
2 ändrade filer med 5 tillägg och 3 borttagningar
  1. 3 2
      Source/cmGlobalVisualStudioGenerator.cxx
  2. 2 1
      Source/cmWin32ProcessExecution.cxx

+ 3 - 2
Source/cmGlobalVisualStudioGenerator.cxx

@@ -611,8 +611,9 @@ void WriteVSMacrosFileRegistryEntry(
     {
     // Create the subkey and set the values of interest:
     HKEY hsubkey = NULL;
-    result = RegCreateKeyEx(hkey, nextAvailableSubKeyName.c_str(), 0, "", 0,
-      KEY_READ|KEY_WRITE, 0, &hsubkey, 0);
+    char lpClass[] = "";
+    result = RegCreateKeyEx(hkey, nextAvailableSubKeyName.c_str(), 0,
+                            lpClass, 0, KEY_READ|KEY_WRITE, 0, &hsubkey, 0);
     if (ERROR_SUCCESS == result)
       {
       DWORD dw = 0;

+ 2 - 1
Source/cmWin32ProcessExecution.cxx

@@ -290,7 +290,8 @@ static BOOL RealPopenCreateProcess(const char *cmdstring,
 {
   PROCESS_INFORMATION piProcInfo;
   STARTUPINFO siStartInfo;
-  char *s1=0,*s2=0, *s3 = " /c ";
+  char *s1=0,*s2=0;
+  const char *s3 = " /c ";
   int i = GetEnvironmentVariable("COMSPEC",NULL,0);
   if (i)
     {