Xcode 10 beta 1: match NS_NOESCAPE in NOZUnzipper.h & .m (#65)

twitterkb · NSProgrammer · commit 5a4a091f1b7b · 2018-06-06T18:07:54.000-07:00
diff --git a/ZipUtilities/NOZUnzipper.h b/ZipUtilities/NOZUnzipper.h
@@ -221,7 +221,7 @@ typedef NS_OPTIONS(NSInteger, NOZUnzipperSaveRecordOptions)
 /**
  Enumerate all the records.
  */
-- (void)enumerateManifestEntriesUsingBlock:(__attribute__((noescape)) NOZUnzipRecordEnumerationBlock __nonnull)block;
+- (void)enumerateManifestEntriesUsingBlock:(NOZUnzipRecordEnumerationBlock __nonnull NS_NOESCAPE)block;
 
 
 /**
diff --git a/ZipUtilities/NOZUnzipper.m b/ZipUtilities/NOZUnzipper.m
@@ -199,7 +199,7 @@ - (NSUInteger)indexForRecordWithName:(NSString *)name
     return (_centralDirectory) ? [_centralDirectory indexForRecordWithName:name] : NSNotFound;
 }
 
-- (void)enumerateManifestEntriesUsingBlock:(NOZUnzipRecordEnumerationBlock)block
+- (void)enumerateManifestEntriesUsingBlock:(NOZUnzipRecordEnumerationBlock NS_NOESCAPE)block
 {
     [_centralDirectory.internalRecords enumerateObjectsUsingBlock:block];
 }

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ - (NSUInteger)indexForRecordWithName:(NSString *)name`
`199`	`199`	`return (_centralDirectory) ? [_centralDirectory indexForRecordWithName:name] : NSNotFound;`
`200`	`200`	`}`
`201`	`201`
`202`		`-- (void)enumerateManifestEntriesUsingBlock:(NOZUnzipRecordEnumerationBlock)block`
	`202`	`+- (void)enumerateManifestEntriesUsingBlock:(NOZUnzipRecordEnumerationBlock NS_NOESCAPE)block`
`203`	`203`	`{`
`204`	`204`	`[_centralDirectory.internalRecords enumerateObjectsUsingBlock:block];`
`205`	`205`	`}`