[Cmake-commits] CMake branch, next, updated. v3.2.1-1337-gb190c08

[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  b190c080a71b5ad153d58a40256d6144d2e84b32 (commit)
       via  e86f44b72616ebce43dcd62d170f7ca90ff31fdf (commit)
      from  dd7fb25261b19798e72e62f080560a504f0e3522 (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=b190c080a71b5ad153d58a40256d6144d2e84b32
commit b190c080a71b5ad153d58a40256d6144d2e84b32
Merge: dd7fb25 e86f44b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 16:29:27 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 31 16:29:27 2015 -0400

    Merge topic 'cpack-deb-format-cast' into next
    
    e86f44b7 cmCPackDebGenerator: Cast file mode to proper type for %o formatter


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e86f44b72616ebce43dcd62d170f7ca90ff31fdf
commit e86f44b72616ebce43dcd62d170f7ca90ff31fdf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 31 16:28:28 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 31 16:28:28 2015 -0400

    cmCPackDebGenerator: Cast file mode to proper type for %o formatter

diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx
index 87764e1..fcf4122 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -805,12 +805,14 @@ static int put_arobj(CF *cfp, struct stat *sb)
   if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
     (void)sprintf(ar_hb, HDR1, AR_EFMT1, (int)lname,
                   (long int)sb->st_mtime, (unsigned)uid, (unsigned)gid,
-                  sb->st_mode, (long long)sb->st_size + lname, ARFMAG);
+                  (unsigned)sb->st_mode, (long long)sb->st_size + lname,
+                  ARFMAG);
     else {
       lname = 0;
       (void)sprintf(ar_hb, HDR2, name,
                     (long int)sb->st_mtime, (unsigned)uid, (unsigned)gid,
-                    sb->st_mode, (long long)sb->st_size, ARFMAG);
+                    (unsigned)sb->st_mode, (long long)sb->st_size,
+                    ARFMAG);
       }
     off_t size = sb->st_size;
 

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

Summary of changes:
 Source/CPack/cmCPackDebGenerator.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake