[Cmake-commits] CMake branch, next, updated. v3.1.0-1634-gd388bda

[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  d388bda78fb01e6a8cebad0464cd7b9eefd91eef (commit)
       via  97f178f061a21fdc060d85982c68b8be5a088858 (commit)
       via  56616160de37c1a2cc5fbcf4c9714db3ca1e5422 (commit)
      from  85045836c29eaa58efdb4c01aeb62d3b44290cac (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=d388bda78fb01e6a8cebad0464cd7b9eefd91eef
commit d388bda78fb01e6a8cebad0464cd7b9eefd91eef
Merge: 8504583 97f178f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 10 12:08:19 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 10 12:08:19 2015 -0500

    Merge topic 'update-kwsys' into next
    
    97f178f0 Merge branch 'upstream-kwsys' into update-kwsys
    56616160 KWSys 2015-01-09 (425fa73e)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=97f178f061a21fdc060d85982c68b8be5a088858
commit 97f178f061a21fdc060d85982c68b8be5a088858
Merge: 6c3e3c1 5661616
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Jan 10 12:07:56 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 10 12:07:56 2015 -0500

    Merge branch 'upstream-kwsys' into update-kwsys


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=56616160de37c1a2cc5fbcf4c9714db3ca1e5422
commit 56616160de37c1a2cc5fbcf4c9714db3ca1e5422
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri Jan 9 15:37:34 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Sat Jan 10 12:07:51 2015 -0500

    KWSys 2015-01-09 (425fa73e)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ 425fa73e | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' d30c9b03..425fa73e
    Ben Boeckel (1):
          425fa73e Add missing malloc return value casts
    
    Change-Id: I3295bc4241b746364c728445114b3a627095838c

diff --git a/EncodingC.c b/EncodingC.c
index cda78e2..ba2cec2 100644
--- a/EncodingC.c
+++ b/EncodingC.c
@@ -44,7 +44,7 @@ wchar_t* kwsysEncoding_DupToWide(const char* str)
   size_t length = kwsysEncoding_mbstowcs(NULL, str, 0) + 1;
   if(length > 0)
     {
-    ret = malloc((length)*sizeof(wchar_t));
+    ret = (wchar_t*)malloc((length)*sizeof(wchar_t));
     ret[0] = 0;
     kwsysEncoding_mbstowcs(ret, str, length);
     }
@@ -71,7 +71,7 @@ char* kwsysEncoding_DupToNarrow(const wchar_t* str)
   size_t length = kwsysEncoding_wcstombs(0, str, 0) + 1;
   if(length > 0)
     {
-    ret = malloc(length);
+    ret = (char*)malloc(length);
     ret[0] = 0;
     kwsysEncoding_wcstombs(ret, str, length);
     }
diff --git a/ProcessUNIX.c b/ProcessUNIX.c
index ca9d424..1be6d02 100644
--- a/ProcessUNIX.c
+++ b/ProcessUNIX.c
@@ -547,7 +547,7 @@ int kwsysProcess_SetPipeFile(kwsysProcess* cp, int prPipe, const char* file)
     }
   if(file)
     {
-    *pfile = malloc(strlen(file)+1);
+    *pfile = (char*)malloc(strlen(file)+1);
     if(!*pfile)
       {
       return 0;
@@ -1468,7 +1468,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp)
     cp->RealWorkingDirectoryLength = 4096;
 #endif
     cp->RealWorkingDirectory =
-      malloc((size_t)(cp->RealWorkingDirectoryLength));
+      (char*)malloc((size_t)(cp->RealWorkingDirectoryLength));
     if(!cp->RealWorkingDirectory)
       {
       return 0;

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

Summary of changes:
 Source/kwsys/EncodingC.c   |    4 ++--
 Source/kwsys/ProcessUNIX.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake