Solved some type conversion warnings; replaced #warning with // TODO
This commit is contained in:
+10
-10
@@ -510,7 +510,7 @@ local int zipGoToFirstDisk(zipFile file)
|
||||
return err;
|
||||
number_disk_next = 0;
|
||||
if (zi->number_disk_with_CD > 0)
|
||||
number_disk_next = zi->number_disk_with_CD - 1;
|
||||
number_disk_next = (int) (zi->number_disk_with_CD - 1);
|
||||
err = zipGoToSpecificDisk(file, number_disk_next, (zi->append == APPEND_STATUS_ADDINZIP));
|
||||
if ((err == ZIP_ERRNO) && (zi->append == APPEND_STATUS_ADDINZIP))
|
||||
err = zipGoToSpecificDisk(file, number_disk_next, 0);
|
||||
@@ -535,7 +535,7 @@ local int zipGoToNextDisk(zipFile file)
|
||||
if (zi->disk_size == 0)
|
||||
return err;
|
||||
|
||||
number_disk_next = zi->number_disk + 1;
|
||||
number_disk_next = (int) (zi->number_disk + 1);
|
||||
|
||||
do
|
||||
{
|
||||
@@ -661,14 +661,14 @@ extern zipFile ZEXPORT zipOpen4(const void *pathname, int append, ZPOS64_T disk_
|
||||
zip64_internal ziinit;
|
||||
zip64_internal* zi;
|
||||
ZPOS64_T byte_before_the_zipfile; /* byte before the zipfile, (>0 for sfx)*/
|
||||
ZPOS64_T size_central_dir; /* size of the central directory */
|
||||
ZPOS64_T offset_central_dir; /* offset of start of central directory */
|
||||
ZPOS64_T number_entry_CD; /* total number of entries in the central dir */
|
||||
ZPOS64_T size_central_dir = 0; /* size of the central directory */
|
||||
ZPOS64_T offset_central_dir = 0; /* offset of start of central directory */
|
||||
ZPOS64_T number_entry_CD = 0; /* total number of entries in the central dir */
|
||||
ZPOS64_T number_entry;
|
||||
ZPOS64_T central_pos;
|
||||
ZPOS64_T size_central_dir_to_read;
|
||||
uLong uL;
|
||||
uLong size_comment;
|
||||
uLong size_comment = 0;
|
||||
size_t buf_size = SIZEDATA_INDATABLOCK;
|
||||
void* buf_read;
|
||||
int err = ZIP_OK;
|
||||
@@ -1428,7 +1428,7 @@ local int zip64FlushWriteBuffer(zip64_internal* zi)
|
||||
max_write = (uInt)size_available;
|
||||
}
|
||||
|
||||
written = ZWRITE64(zi->z_filefunc, zi->filestream, zi->ci.buffered_data + total_written, max_write);
|
||||
written = (int) ZWRITE64(zi->z_filefunc, zi->filestream, zi->ci.buffered_data + total_written, max_write);
|
||||
|
||||
if (ZERROR64(zi->z_filefunc,zi->filestream))
|
||||
{
|
||||
@@ -1784,7 +1784,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, ZPOS64_T uncompressed_si
|
||||
|
||||
/* Local file header is stored on previous disk, switch to make edits */
|
||||
if (zi->ci.number_disk != cur_number_disk)
|
||||
zipGoToSpecificDisk(file, zi->ci.number_disk, 1);
|
||||
zipGoToSpecificDisk(file, (int) (zi->ci.number_disk), 1);
|
||||
|
||||
if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET) != 0)
|
||||
err = ZIP_ERRNO;
|
||||
@@ -1818,7 +1818,7 @@ extern int ZEXPORT zipCloseFileInZipRaw64(zipFile file, ZPOS64_T uncompressed_si
|
||||
|
||||
/* Now switch back again to the disk we were on before */
|
||||
if (zi->ci.number_disk != cur_number_disk)
|
||||
zipGoToSpecificDisk(file, cur_number_disk, 1);
|
||||
zipGoToSpecificDisk(file, (int) cur_number_disk, 1);
|
||||
|
||||
if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip, ZLIB_FILEFUNC_SEEK_SET) != 0)
|
||||
err = ZIP_ERRNO;
|
||||
@@ -1877,7 +1877,7 @@ extern int ZEXPORT zipClose(zipFile file, const char* global_comment)
|
||||
{
|
||||
if ((err == ZIP_OK) && (ldi->filled_in_this_block > 0))
|
||||
{
|
||||
write = ZWRITE64(zi->z_filefunc, zi->filestream, ldi->data, ldi->filled_in_this_block);
|
||||
write = (int) ZWRITE64(zi->z_filefunc, zi->filestream, ldi->data, ldi->filled_in_this_block);
|
||||
if (write != ldi->filled_in_this_block)
|
||||
err = ZIP_ERRNO;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user