Skip to content

Commit c516f7b

Browse files
MaddTheSaneMaddTheSane
committed
Remove references to __autoreleasing and _Nullable
1 parent 471270e commit c516f7b

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

‎CSFileHandle.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ +(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes
6767
return nil;
6868
}
6969

70-
+(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path error:(NSError *__autoreleasing *)outErr
70+
+(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path error:(NSError **)outErr
7171
{ return [self fileHandleForFileURL:path modes:@"rb" error:outErr]; }
7272

73-
+(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path error:(NSError *__autoreleasing *)outErr
73+
+(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path error:(NSError **)outErr
7474
{ return [self fileHandleForFileURL:path modes:@"wb" error:outErr]; }
7575

76-
+(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes error:(NSError *__autoreleasing *)outErr
76+
+(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes error:(NSError **)outErr
7777
{
7878
if(!path) {
7979
if (outErr) {
@@ -94,7 +94,7 @@ +(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes erro
9494

9595
if(!fileh) {
9696
if (outErr) {
97-
*outErr = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{NSURLErrorKey: path}];
97+
*outErr = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSURLErrorKey, nil]];
9898
}
9999
return nil;
100100
}
@@ -104,7 +104,7 @@ +(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes erro
104104

105105
fclose(fileh);
106106
if (outErr) {
107-
*outErr = [NSError errorWithDomain:XADErrorDomain code:XADErrorUnknown userInfo:@{NSURLErrorKey: path}];
107+
*outErr = [NSError errorWithDomain:XADErrorDomain code:XADErrorUnknown userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSURLErrorKey, nil]];
108108
}
109109
return nil;
110110
}

‎XADArchiveParser.m‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,7 +1422,7 @@ -(CSHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOO
14221422

14231423
+(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry
14241424
resourceForkDictionary:(NSDictionary *)forkentry archiveParser:(XADArchiveParser *)parser
1425-
wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
1425+
wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
14261426
{
14271427
@try {
14281428
XADArchiveParser *tmpParse = [self archiveParserForEntryWithDictionary:entry resourceForkDictionary:forkentry archiveParser:parser wantChecksum:checksum];
@@ -1441,7 +1441,7 @@ +(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry
14411441
return nil;
14421442
}
14431443

1444-
-(XADString *)linkDestinationForDictionary:(NSDictionary *)dict nserror:(NSError *__autoreleasing __nullable*__nullable)errorptr
1444+
-(XADString *)linkDestinationForDictionary:(NSDictionary *)dict nserror:(NSError **)errorptr
14451445
{
14461446
@try {
14471447
XADString *tmpParse = [self linkDestinationForDictionary:dict];
@@ -1460,7 +1460,7 @@ -(XADString *)linkDestinationForDictionary:(NSDictionary *)dict nserror:(NSError
14601460
return nil;
14611461
}
14621462

1463-
+(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
1463+
+(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
14641464
{
14651465
@try {
14661466
XADArchiveParser *tmpParse = [self archiveParserForEntryWithDictionary:entry resourceForkDictionary:nil archiveParser:parser wantChecksum:checksum];
@@ -1479,7 +1479,7 @@ +(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry a
14791479
return nil;
14801480
}
14811481

1482-
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
1482+
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)name nserror:(NSError **)errorptr
14831483
{
14841484
@try {
14851485
XADArchiveParser *tmpParse = [self archiveParserForHandle:handle resourceFork:nil name:name];
@@ -1498,7 +1498,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)
14981498
return nil;
14991499
}
15001500

1501-
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
1501+
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError **)errorptr
15021502
{
15031503
@try {
15041504
XADArchiveParser *tmpParse = [self archiveParserForHandle:handle firstBytes:header resourceFork:fork name:name];
@@ -1517,7 +1517,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSDat
15171517
return nil;
15181518
}
15191519

1520-
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
1520+
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header name:(NSString *)name nserror:(NSError **)errorptr
15211521
{
15221522
@try {
15231523
XADArchiveParser *tmpParse = [self archiveParserForHandle:handle firstBytes:header resourceFork:nil name:name];
@@ -1536,7 +1536,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSDat
15361536
return nil;
15371537
}
15381538

1539-
+(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError * _Nullable *)errorptr
1539+
+(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError **)errorptr
15401540
{
15411541
@try {
15421542
XADArchiveParser *tmpParse = [self archiveParserForFileURL:filename];
@@ -1555,7 +1555,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError *
15551555
return nil;
15561556
}
15571557

1558-
+(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
1558+
+(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError **)errorptr
15591559
{
15601560
@try {
15611561
XADArchiveParser *tmpParse = [self archiveParserForPath:filename];
@@ -1574,7 +1574,7 @@ +(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError
15741574
return nil;
15751575
}
15761576

1577-
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
1577+
+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError **)errorptr
15781578
{
15791579
@try {
15801580
XADArchiveParser *parser = [self archiveParserForHandle:handle resourceFork:fork name:name];
@@ -1593,7 +1593,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XAD
15931593
return nil;
15941594
}
15951595

1596-
-(XADHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum nserror:(NSError * _Nullable *)errorptr
1596+
-(XADHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
15971597
{
15981598
@try
15991599
{

‎XADUnarchiver.m‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ +(XADUnarchiver *)unarchiverForPath:(NSString *)path error:(XADError *)errorptr
4343
return [[[self alloc] initWithArchiveParser:archiveparser] autorelease];
4444
}
4545

46-
+(XADUnarchiver *)unarchiverForPath:(NSString *)path nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
46+
+(XADUnarchiver *)unarchiverForPath:(NSString *)path nserror:(NSError **)errorptr
4747
{
4848
XADArchiveParser *archiveparser=[XADArchiveParser archiveParserForPath:path nserror:errorptr];
4949
if(!archiveparser) return nil;
@@ -324,7 +324,7 @@ -(XADError)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path f
324324
}
325325

326326
// FIXME: Improve extractEntryWithDictionary:as:forceDirectories:error: with an NSError value.
327-
-(BOOL)extractEntryWithDictionary:(NSDictionary *)dict as:(nullable NSString *)path forceDirectories:(BOOL)force error:(NSError*__autoreleasing*)outErr
327+
-(BOOL)extractEntryWithDictionary:(NSDictionary *)dict as:(nullable NSString *)path forceDirectories:(BOOL)force error:(NSError**)outErr
328328
{
329329
__strong NSError *tmpErr = nil;
330330
BOOL okay;
@@ -574,7 +574,7 @@ -(XADError)_fixDeferredDirectories
574574

575575

576576
-(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict
577-
wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
577+
wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
578578
{
579579
return [self unarchiverForEntryWithDictionary:dict resourceForkDictionary:nil
580580
wantChecksum:checksum nserror:errorptr];
@@ -608,7 +608,7 @@ -(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict
608608

609609

610610
-(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict
611-
resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
611+
resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
612612
{
613613
XADArchiveParser *subparser=[XADArchiveParser
614614
archiveParserForEntryWithDictionary:dict
@@ -1006,7 +1006,7 @@ -(XADError)runExtractorWithDictionary:(NSDictionary *)dict
10061006
return XADErrorNone;
10071007
}
10081008

1009-
-(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *)handle error:(NSError *__autoreleasing _Nullable * _Nullable)outError
1009+
-(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *)handle error:(NSError **)outError
10101010
{
10111011
return [self runExtractorWithDictionary:dict outputTarget:self
10121012
selector:@selector(_outputToHandle:bytes:length:) argument:handle error:outError];

0 commit comments

Comments
 (0)