summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2007-09-27 18:44:11 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2007-09-27 18:44:11 (GMT)
commit887699184a3cdbaa1b38f2c5a38e43de3e11b063 (patch)
tree6f95b6fa4a0a70ce2704d100aaab0cc48594673b
parentef3c6f31fde39f7a68c4eab68e57815b2190b6da (diff)
downloadCMake-887699184a3cdbaa1b38f2c5a38e43de3e11b063.zip
CMake-887699184a3cdbaa1b38f2c5a38e43de3e11b063.tar.gz
CMake-887699184a3cdbaa1b38f2c5a38e43de3e11b063.tar.bz2
COMP: remove warnings
-rw-r--r--Source/CPack/cmCPackTGZGenerator.cxx5
-rw-r--r--Source/cmGeneratedFileStream.cxx2
-rw-r--r--Source/cmSystemTools.cxx2
-rw-r--r--Utilities/cmtar/libtar.c4
4 files changed, 7 insertions, 6 deletions
diff --git a/Source/CPack/cmCPackTGZGenerator.cxx b/Source/CPack/cmCPackTGZGenerator.cxx
index 4d5c470..22d6de3 100644
--- a/Source/CPack/cmCPackTGZGenerator.cxx
+++ b/Source/CPack/cmCPackTGZGenerator.cxx
@@ -129,7 +129,7 @@ ssize_t cmCPackTGZ_Data_Write(void *client_data, void *buff, size_t n)
if ( mydata->Compress )
{
- mydata->ZLibStream.avail_in = n;
+ mydata->ZLibStream.avail_in = static_cast<uInt>(n);
mydata->ZLibStream.next_in = reinterpret_cast<Bytef*>(buff);
do {
@@ -157,7 +157,8 @@ ssize_t cmCPackTGZ_Data_Write(void *client_data, void *buff, size_t n)
}
if ( n )
{
- mydata->CRC = crc32(mydata->CRC, reinterpret_cast<Bytef *>(buff), n);
+ mydata->CRC = crc32(mydata->CRC, reinterpret_cast<Bytef *>(buff),
+ static_cast<uInt>(n));
}
}
else
diff --git a/Source/cmGeneratedFileStream.cxx b/Source/cmGeneratedFileStream.cxx
index 82ac2b7..660d9d5 100644
--- a/Source/cmGeneratedFileStream.cxx
+++ b/Source/cmGeneratedFileStream.cxx
@@ -228,7 +228,7 @@ int cmGeneratedFileStreamBase::CompressFile(const char* oldname,
char buffer[BUFFER_SIZE];
while ( (res = fread(buffer, 1, BUFFER_SIZE, ifs)) > 0 )
{
- if ( !gzwrite(gf, buffer, res) )
+ if ( !gzwrite(gf, buffer, static_cast<int>(res)) )
{
fclose(ifs);
gzclose(gf);
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2f5bb5b..04d6885 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1661,7 +1661,7 @@ ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf,
size_t count)
{
cmSystemToolsGZStruct* gzf = static_cast<cmSystemToolsGZStruct*>(call_data);
- return gzwrite(gzf->GZFile, (void*)buf, count);
+ return gzwrite(gzf->GZFile, (void*)buf, static_cast<int>(count));
}
#endif
diff --git a/Utilities/cmtar/libtar.c b/Utilities/cmtar/libtar.c
index e9a14d8..b509349 100644
--- a/Utilities/cmtar/libtar.c
+++ b/Utilities/cmtar/libtar.c
@@ -130,13 +130,13 @@ static int libtar_gzclose(void* call_data)
static ssize_t libtar_gzread(void* call_data, void* buf, size_t count)
{
struct gzStruct* gzf = (struct gzStruct*)call_data;
- return gzread(gzf->GZFile, buf, count);
+ return gzread(gzf->GZFile, buf, (unsigned int)count);
}
static ssize_t libtar_gzwrite(void* call_data, const void* buf, size_t count)
{
struct gzStruct* gzf = (struct gzStruct*)call_data;
- return gzwrite(gzf->GZFile, (void*)buf, count);
+ return gzwrite(gzf->GZFile, (void*)buf, (unsigned int)count);
}
tartype_t gztype = {