kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix integer conversions in cpack

Browse Source 
These were revealed by GCC's -Wconversion option.
This commit is contained in:
Brad King 2010-06-30 09:57:07 -04:00
parent fec71d8016
commit 050af165bb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CPack/cmCPackDebGenerator.cxx
View File

@ -135,7 +135,7 @@ int cmCPackDebGenerator::CompressFiles(const char* outFileName,
// now add all directories which have to be compressed // now add all directories which have to be compressed
// collect all top level install dirs for that // collect all top level install dirs for that
// e.g. /opt/bin/foo, /usr/bin/bar and /usr/bin/baz would give /usr and /opt // e.g. /opt/bin/foo, /usr/bin/bar and /usr/bin/baz would give /usr and /opt
int topLevelLength = strlen(toplevel); size_t topLevelLength = strlen(toplevel);
std::set<std::string> installDirs; std::set<std::string> installDirs;
for (std::vector<std::string>::const_iterator fileIt = files.begin(); for (std::vector<std::string>::const_iterator fileIt = files.begin();
fileIt != files.end(); ++ fileIt ) fileIt != files.end(); ++ fileIt )
@ -371,7 +371,7 @@ static const char * ar_rname(const char *path)
typedef struct ar_hdr HDR; typedef struct ar_hdr HDR;
static char ar_hb[sizeof(HDR) + 1]; /* real header */ static char ar_hb[sizeof(HDR) + 1]; /* real header */
static int ar_already_written; static size_t ar_already_written;
/* copy_ar -- /* copy_ar --
* Copy size bytes from one file to another - taking care to handle the * Copy size bytes from one file to another - taking care to handle the
@ -431,7 +431,7 @@ static int put_arobj(CF *cfp, struct stat *sb)
/* If not truncating names and the name is too long or contains /* If not truncating names and the name is too long or contains
* a space, use extended format 1. */ * a space, use extended format 1. */
unsigned int lname = strlen(name); size_t lname = strlen(name);
uid_t uid = sb->st_uid; uid_t uid = sb->st_uid;
gid_t gid = sb->st_gid; gid_t gid = sb->st_gid;
if (uid > USHRT_MAX) { if (uid > USHRT_MAX) {
@ -441,7 +441,7 @@ static int put_arobj(CF *cfp, struct stat *sb)
gid = USHRT_MAX; gid = USHRT_MAX;
} }
if (lname > sizeof(hdr->ar_name) || strchr(name, ' ')) if (lname > sizeof(hdr->ar_name) || strchr(name, ' '))
(void)sprintf(ar_hb, HDR1, AR_EFMT1, lname, (void)sprintf(ar_hb, HDR1, AR_EFMT1, (int)lname,
(long int)sb->st_mtime, uid, gid, sb->st_mode, (long int)sb->st_mtime, uid, gid, sb->st_mode,
(long long)sb->st_size + lname, ARFMAG); (long long)sb->st_size + lname, ARFMAG);
else { else {