[Cmake-commits] CMake branch, next, updated. v2.8.3-1101-g9cdbb40

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  9cdbb403f8832f97f1895ce109923b3a631a1021 (commit)
       via  0bb22cfabed29e9e2ce6f1b3a551f7ea68311390 (commit)
       via  75191fa31281732ddbfd621af80bc188de9cd097 (commit)
      from  d5ea79c088bea619a87a4e1c1cc3f6b84d5a27e7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cdbb403f8832f97f1895ce109923b3a631a1021
commit 9cdbb403f8832f97f1895ce109923b3a631a1021
Merge: d5ea79c 0bb22cf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 28 09:57:52 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 28 09:57:52 2010 -0500

    Merge topic 'fix-warning-char-string-constant' into next
    
    0bb22cf Avoid passing string literal to char* type
    75191fa KWSys: Avoid passing string literal as char*


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0bb22cfabed29e9e2ce6f1b3a551f7ea68311390
commit 0bb22cfabed29e9e2ce6f1b3a551f7ea68311390
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Dec 28 09:53:09 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Dec 28 09:57:35 2010 -0500

    Avoid passing string literal to char* type

diff --git a/Source/cmGlobalVisualStudioGenerator.cxx b/Source/cmGlobalVisualStudioGenerator.cxx
index 7696e6c..449d090 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/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;
diff --git a/Source/cmWin32ProcessExecution.cxx b/Source/cmWin32ProcessExecution.cxx
index d9bd26c..f37e0ff 100644
--- a/Source/cmWin32ProcessExecution.cxx
+++ b/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)
     {

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudioGenerator.cxx |    5 +++--
 Source/cmWin32ProcessExecution.cxx       |    3 ++-
 Source/kwsys/Registry.cxx                |    3 ++-
 Source/kwsys/SystemTools.cxx             |    3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake