12 Commits
1.0.2 ... 1.0.3

Author SHA1 Message Date
Gianluca Bertani
04d8d9d1d4 Fixed podspec by adding public headers 2016-08-28 12:12:38 +02:00
Gianluca Bertani
cc40af1311 Bumped version to 1.0.3 2016-08-28 11:28:16 +02:00
Gianluca Bertani
1dbde8f9c9 Bumped version to 1.0.3 2016-08-28 11:26:08 +02:00
Gianluca Bertani
5a90a66267 Merge pull request #41 from atlasti/master
Removing a potential leak found by static analysis.
2016-08-28 11:01:55 +02:00
Gianluca Bertani
00386a3fe9 Merge pull request #48 from andyj-at-aspin/Swift3ExceptionThrowing
Changed throwing of Swift errors
2016-08-28 10:59:34 +02:00
Andy Johnson
ec6056de67 Changed throwing of Swift errors from the Stream reading/writing to be nonnull_error rather than zero_result. Continues to work with Swift 2.x but now works with Swift 3 Beta (circa XCode 8 beta 6) 2016-08-26 16:53:19 +01:00
Martin Winter
2485f97586 Apply changes from commit e54e129 of https://github.com/madler/zlib/ repository to silence compiler warning about shifting a negative signed value. 2016-04-01 13:57:52 +01:00
Gianluca Bertani
8364f87f9a Merge pull request #44 from deni2s/master
Update README.md
2016-03-18 08:37:38 +01:00
deni2s
9dfa7e43da Update README.md
Suppresses warning about using int type instead of long long for info.size
2016-03-17 17:38:39 +02:00
Gianluca Bertani
401dfa4b17 Merge pull request #43 from deni2s/patch-1
Update README.md
2016-03-17 16:21:54 +01:00
deni2s
a1e5810879 Update README.md
Fixed typo in example code
2016-03-17 17:07:48 +02:00
Kevin Meaney
64185c4750 Removing a potential leek found by static analysis. 2016-01-04 11:22:31 +00:00
29 changed files with 57 additions and 34 deletions

View File

@@ -342,7 +342,10 @@ local ZPOS64_T unz64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
return 0;
if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
{
TRYFREE(buf);
return 0;
}
file_size = ZTELL64(*pzlib_filefunc_def, filestream);

View File

@@ -575,7 +575,10 @@ local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_f
return 0;
if (ZSEEK64(*pzlib_filefunc_def, filestream, 0, ZLIB_FILEFUNC_SEEK_END) != 0)
{
TRYFREE(buf);
return 0;
}
file_size = ZTELL64(*pzlib_filefunc_def, filestream);

View File

@@ -1,6 +1,6 @@
//
// OZFileInZipInfo+Internals.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZFileInZipInfo.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZFileInZipInfo.m
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipCompressionLevel.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipException+Internals.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipException.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipException.m
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipFile+NSError.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
@@ -231,7 +231,7 @@ static const NSInteger OZLocateFileResultFound= 1;
@throws OZZipException If the zip file has been opened with a mode other than
Unzip.
*/
- (NSInteger) __attribute__((swift_error(zero_result))) locateFileInZip:(nonnull NSString *)fileNameInZip error:(NSError * __autoreleasing __nullable * __nullable)error;
- (NSInteger) __attribute__((swift_error(nonnull_error))) locateFileInZip:(nonnull NSString *)fileNameInZip error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Returns the number of files contained in the zip file.
@@ -242,7 +242,7 @@ static const NSInteger OZLocateFileResultFound= 1;
@throws OZZipException If the zip file has been opened with a mode other
than Unzip.
*/
- (NSUInteger) __attribute__((swift_error(zero_result))) numFilesInZipWithError:(NSError * __autoreleasing __nullable * __nullable)error;
- (NSUInteger) __attribute__((swift_error(nonnull_error))) numFilesInZipWithError:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Returns a list of OZFileInZipInfo with the information on all the files

View File

@@ -1,6 +1,6 @@
//
// OZZipFile+Standard.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipFile.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipFile.m
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipFileMode.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipReadStream+Internals.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipReadStream+NSError.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.
@@ -58,7 +58,7 @@ static const NSInteger OZReadStreamResultEndOfFile= -1;
<br/>NOTE: return value convention is different in the standard (non-NSError
compliant) interface.
*/
- (NSInteger) __attribute__((swift_error(zero_result))) readDataWithBuffer:(nonnull NSMutableData *)buffer error:(NSError * __autoreleasing __nullable * __nullable)error;
- (NSInteger) __attribute__((swift_error(nonnull_error))) readDataWithBuffer:(nonnull NSMutableData *)buffer error:(NSError * __autoreleasing __nullable * __nullable)error;
/**
@brief Closes the read steam.

View File

@@ -1,6 +1,6 @@
//
// OZZipReadStream+Standard.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipReadStream.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 28/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipReadStream.m
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 28/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipWriteStream+Internals.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipWriteStream+NSError.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipWriteStream+Standard.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipWriteStream.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// OZZipWriteStream.m
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 25/12/09.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// Objective-Zip+NSError.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 09/09/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -1,6 +1,6 @@
//
// Objective-Zip.h
// Objective-Zip v. 1.0.2
// Objective-Zip v. 1.0.3
//
// Created by Gianluca Bertani on 27/08/15.
// Copyright 2009-2015 Gianluca Bertani. All rights reserved.

View File

@@ -175,12 +175,11 @@ zip and expand it:
```objective-c
OZZipFile *unzipFile= [[OZZipFile alloc] initWithFileName:@"test.zip"
mode:ZipFileModeUnzip];
mode:OZZipFileModeUnzip];
NSArray *infos= [unzipFile listFileInZipInfos];
for (OZFileInZipInfo *info in infos) {
NSLog(@"- %@ %@ %d (%d)", info.name, info.date, info.size,
info.level);
NSLog(@"- %@ %@ %llu (%d)", info.name, info.date, info.size, info.level);
// Locate the file in the zip
[unzipFile locateFileInZip:info.name];
@@ -280,6 +279,13 @@ The library is distributed under the New BSD License.
Version history
===============
Version 1.0.3:
- Fixed some memory leaks in MiniZip (contributed by @SheffieldKevin)
- Silenced a warning about shifting a negative value in ZLib (contributed by Martin Winter)
- Fixed throwing of errors so that it is compatible with Swift 3 (contributed by @andyj-at-aspin)
- Fixed typos and errors in README (contributed by @deni2s)
Version 1.0.2:
- Fixed interface for `locateFileInZip` and `readDataWithBuffer` in NSError
@@ -351,7 +357,7 @@ Version 0.7.0:
Compatibility
=============
Version 1.0.2 has been tested with iOS up to 9.0 and OS X up to 10.11, but
Version 1.0.3 has been tested with iOS up to 9.3 and OS X up to 10.11, but
should be compatible with earlier versions too, down to iOS 5.1 and OS X 10.7.
Le me know of any issues that should arise.

View File

@@ -1504,9 +1504,10 @@ z_streamp strm;
{
struct inflate_state FAR *state;
if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16;
if (strm == Z_NULL || strm->state == Z_NULL)
return (long)(((unsigned long)0 - 1) << 16);
state = (struct inflate_state FAR *)strm->state;
return ((long)(state->back) << 16) +
return (long)(((unsigned long)((long)state->back)) << 16) +
(state->mode == COPY ? state->length :
(state->mode == MATCH ? state->was - state->length : 0));
}

View File

@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
# ――― Spec Metadata ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.name = "objective-zip"
s.version = "1.0.2"
s.version = "1.0.3"
s.summary = "An object-oriented friendly wrapper library for ZLib and MiniZip, in Objective-C for iOS and OS X"
s.description = <<-DESC
@@ -48,6 +48,16 @@ Pod::Spec.new do |s|
s.source_files = "Objective-Zip/**/*.{h,m}", "MiniZip/**/*.{h,c}", "ZLib/**/*.{h,c}"
# ――― Publich Headers ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.public_header_files = ["Objective-Zip/OZZipFile.h", "Objective-Zip/OZZipFile+Standard.h", "Objective-Zip/OZZipFile+NSError.h",
"Objective-Zip/OZZipFileMode.h", "Objective-Zip/OZZipCompressionLevel.h", "Objective-Zip/OZZipException.h",
"Objective-Zip/OZZipWriteStream.h", "Objective-Zip/OZZipWriteStream+Standard.h",
"Objective-Zip/OZZipWriteStream+NSError.h", "Objective-Zip/OZZipReadStream.h",
"Objective-Zip/OZZipReadStream+Standard.h", "Objective-Zip/OZZipReadStream+NSError.h",
"Objective-Zip/OZFileInZipInfo.h", "Objective-Zip/Objective-Zip.h", "Objective-Zip/Objective-Zip+NSError.h"]
# ――― Project Settings ――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
s.requires_arc = true