[Cmake-commits] CMake branch, next, updated. v3.2.2-3242-gf30279f

Brad King brad.king at kitware.com
Thu May 28 11:11:22 EDT 2015


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  f30279f35efef676c3dd74a69b05a91fc7692123 (commit)
       via  3fe80b57b9a77313dc26330b2083643160def2c4 (commit)
      from  1951bec46f981e3beed0b18e387088d0c82a5fd0 (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=f30279f35efef676c3dd74a69b05a91fc7692123
commit f30279f35efef676c3dd74a69b05a91fc7692123
Merge: 1951bec 3fe80b5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 28 11:11:22 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 28 11:11:22 2015 -0400

    Merge topic 'file-log-less-data' into next
    
    3fe80b57 fixup! cmFileCommand: Do not log raw protocol data from curl (#15589)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3fe80b57b9a77313dc26330b2083643160def2c4
commit 3fe80b57b9a77313dc26330b2083643160def2c4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 28 11:11:04 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 28 11:11:04 2015 -0400

    fixup! cmFileCommand: Do not log raw protocol data from curl (#15589)

diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index ac69e3d..4698468 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -2816,7 +2816,8 @@ namespace {
       case CURLINFO_SSL_DATA_OUT:
         {
         char buf[128];
-        int n = sprintf(buf, "[%" cmIML_INT_PRIu64 " bytes data]\n", size);
+        int n = sprintf(buf, "[%" cmIML_INT_PRIu64 " bytes data]\n",
+                        static_cast<cmIML_INT_uint64_t>(size));
         if (n > 0)
           {
           vec->insert(vec->end(), buf, buf + n);

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

Summary of changes:
 Source/cmFileCommand.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list