From 0d62b04cc67a6d36f67e927a5f5562761355b0f3 Mon Sep 17 00:00:00 2001 From: Gianluca Bertani Date: Fri, 28 Aug 2015 17:33:58 +0200 Subject: [PATCH] Fixed some conversion warnings (pull request #28) --- Objective-Zip/OZZipFile.m | 36 ++++++++++++++++---------------- Objective-Zip/OZZipReadStream.m | 2 +- Objective-Zip/OZZipWriteStream.m | 2 +- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Objective-Zip/OZZipFile.m b/Objective-Zip/OZZipFile.m index efc1b36..44ec46c 100644 --- a/Objective-Zip/OZZipFile.m +++ b/Objective-Zip/OZZipFile.m @@ -140,12 +140,12 @@ NSCalendar *calendar= [NSCalendar currentCalendar]; NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:now]; zip_fileinfo zi; - zi.tmz_date.tm_sec= [date second]; - zi.tmz_date.tm_min= [date minute]; - zi.tmz_date.tm_hour= [date hour]; - zi.tmz_date.tm_mday= [date day]; - zi.tmz_date.tm_mon= [date month] -1; - zi.tmz_date.tm_year= [date year]; + zi.tmz_date.tm_sec= (uInt) [date second]; + zi.tmz_date.tm_min= (uInt) [date minute]; + zi.tmz_date.tm_hour= (uInt) [date hour]; + zi.tmz_date.tm_mday= (uInt) [date day]; + zi.tmz_date.tm_mon= (uInt) [date month] -1; + zi.tmz_date.tm_year= (uInt) [date year]; zi.internal_fa= 0; zi.external_fa= 0; zi.dosDate= 0; @@ -179,12 +179,12 @@ NSCalendar *calendar= [NSCalendar currentCalendar]; NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:fileDate]; zip_fileinfo zi; - zi.tmz_date.tm_sec= [date second]; - zi.tmz_date.tm_min= [date minute]; - zi.tmz_date.tm_hour= [date hour]; - zi.tmz_date.tm_mday= [date day]; - zi.tmz_date.tm_mon= [date month] -1; - zi.tmz_date.tm_year= [date year]; + zi.tmz_date.tm_sec= (uInt) [date second]; + zi.tmz_date.tm_min= (uInt) [date minute]; + zi.tmz_date.tm_hour= (uInt) [date hour]; + zi.tmz_date.tm_mday= (uInt) [date day]; + zi.tmz_date.tm_mon= (uInt) [date month] -1; + zi.tmz_date.tm_year= (uInt) [date year]; zi.internal_fa= 0; zi.external_fa= 0; zi.dosDate= 0; @@ -218,12 +218,12 @@ NSCalendar *calendar= [NSCalendar currentCalendar]; NSDateComponents *date= [calendar components:(NSSecondCalendarUnit | NSMinuteCalendarUnit | NSHourCalendarUnit | NSDayCalendarUnit | NSMonthCalendarUnit | NSYearCalendarUnit) fromDate:fileDate]; zip_fileinfo zi; - zi.tmz_date.tm_sec= [date second]; - zi.tmz_date.tm_min= [date minute]; - zi.tmz_date.tm_hour= [date hour]; - zi.tmz_date.tm_mday= [date day]; - zi.tmz_date.tm_mon= [date month] -1; - zi.tmz_date.tm_year= [date year]; + zi.tmz_date.tm_sec= (uInt) [date second]; + zi.tmz_date.tm_min= (uInt) [date minute]; + zi.tmz_date.tm_hour= (uInt) [date hour]; + zi.tmz_date.tm_mday= (uInt) [date day]; + zi.tmz_date.tm_mon= (uInt) [date month] -1; + zi.tmz_date.tm_year= (uInt) [date year]; zi.internal_fa= 0; zi.external_fa= 0; zi.dosDate= 0; diff --git a/Objective-Zip/OZZipReadStream.m b/Objective-Zip/OZZipReadStream.m index 0f99ce3..3b124cb 100644 --- a/Objective-Zip/OZZipReadStream.m +++ b/Objective-Zip/OZZipReadStream.m @@ -74,7 +74,7 @@ #pragma mark Reading data - (NSUInteger) readDataWithBuffer:(NSMutableData *)buffer { - int err= unzReadCurrentFile(_unzFile, [buffer mutableBytes], [buffer length]); + int err= unzReadCurrentFile(_unzFile, [buffer mutableBytes], (uInt) [buffer length]); if (err < 0) { NSString *reason= [NSString stringWithFormat:@"Error reading '%@' in the zipfile", _fileNameInZip]; @throw [[OZZipException alloc] initWithError:err reason:reason]; diff --git a/Objective-Zip/OZZipWriteStream.m b/Objective-Zip/OZZipWriteStream.m index 0ff252c..492cb8a 100644 --- a/Objective-Zip/OZZipWriteStream.m +++ b/Objective-Zip/OZZipWriteStream.m @@ -74,7 +74,7 @@ #pragma mark Writing data - (void) writeData:(NSData *)data { - int err= zipWriteInFileInZip(_zipFile, [data bytes], [data length]); + int err= zipWriteInFileInZip(_zipFile, [data bytes], (uInt) [data length]); if (err < 0) { NSString *reason= [NSString stringWithFormat:@"Error writing '%@' in the zipfile", _fileNameInZip]; @throw [[OZZipException alloc] initWithError:err reason:reason];