Remove references to __autoreleasing and _Nullable

MacPaw · Feb 7, 2025 · c516f7b · c516f7b
1 parent 471270e
commit c516f7b
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/CSFileHandle.m b/CSFileHandle.m
@@ -67,13 +67,13 @@ +(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes
 	return nil;
 }
 
-+(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path error:(NSError *__autoreleasing *)outErr
++(CSFileHandle *)fileHandleForReadingAtFileURL:(NSURL *)path error:(NSError **)outErr
 { return [self fileHandleForFileURL:path modes:@"rb" error:outErr]; }
 
-+(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path error:(NSError *__autoreleasing *)outErr
++(CSFileHandle *)fileHandleForWritingAtFileURL:(NSURL *)path error:(NSError **)outErr
 { return [self fileHandleForFileURL:path modes:@"wb" error:outErr]; }
 
-+(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes error:(NSError *__autoreleasing *)outErr
++(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes error:(NSError **)outErr
 {
 	if(!path) {
 		if (outErr) {
@@ -94,7 +94,7 @@ +(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes erro
 
 	if(!fileh) {
 		if (outErr) {
-			*outErr = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{NSURLErrorKey: path}];
+			*outErr = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSURLErrorKey, nil]];
 		}
 		return nil;
 	}
@@ -104,7 +104,7 @@ +(CSFileHandle *)fileHandleForFileURL:(NSURL *)path modes:(NSString *)modes erro
 
 	fclose(fileh);
 	if (outErr) {
-		*outErr = [NSError errorWithDomain:XADErrorDomain code:XADErrorUnknown userInfo:@{NSURLErrorKey: path}];
+		*outErr = [NSError errorWithDomain:XADErrorDomain code:XADErrorUnknown userInfo:[NSDictionary dictionaryWithObjectsAndKeys:path, NSURLErrorKey, nil]];
 	}
 	return nil;
 }

diff --git a/XADArchiveParser.m b/XADArchiveParser.m
@@ -1422,7 +1422,7 @@ -(CSHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOO
 
 +(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry
 resourceForkDictionary:(NSDictionary *)forkentry archiveParser:(XADArchiveParser *)parser
-wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
+wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *tmpParse = [self archiveParserForEntryWithDictionary:entry resourceForkDictionary:forkentry archiveParser:parser wantChecksum:checksum];
@@ -1441,7 +1441,7 @@ +(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry
 	return nil;
 }
 
--(XADString *)linkDestinationForDictionary:(NSDictionary *)dict nserror:(NSError *__autoreleasing __nullable*__nullable)errorptr
+-(XADString *)linkDestinationForDictionary:(NSDictionary *)dict nserror:(NSError **)errorptr
 {
 	@try {
 		XADString *tmpParse = [self linkDestinationForDictionary:dict];
@@ -1460,7 +1460,7 @@ -(XADString *)linkDestinationForDictionary:(NSDictionary *)dict nserror:(NSError
 	return nil;
 }
 
-+(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
++(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *tmpParse = [self archiveParserForEntryWithDictionary:entry resourceForkDictionary:nil archiveParser:parser wantChecksum:checksum];
@@ -1479,7 +1479,7 @@ +(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry a
 	return nil;
 }
 
-+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)name nserror:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *tmpParse = [self archiveParserForHandle:handle resourceFork:nil name:name];
@@ -1498,7 +1498,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)
 	return nil;
 }
 
-+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *tmpParse = [self archiveParserForHandle:handle firstBytes:header resourceFork:fork name:name];
@@ -1517,7 +1517,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSDat
 	return nil;
 }
 
-+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSData *)header name:(NSString *)name nserror:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *tmpParse = [self archiveParserForHandle:handle firstBytes:header resourceFork:nil name:name];
@@ -1536,7 +1536,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle firstBytes:(NSDat
 	return nil;
 }
 
-+(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError * _Nullable *)errorptr
++(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *tmpParse = [self archiveParserForFileURL:filename];
@@ -1555,7 +1555,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError *
 	return nil;
 }
 
-+(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
++(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *tmpParse = [self archiveParserForPath:filename];
@@ -1574,7 +1574,7 @@ +(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError
 	return nil;
 }
 
-+(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
++(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XADResourceFork *)fork name:(NSString *)name nserror:(NSError **)errorptr
 {
 	@try {
 		XADArchiveParser *parser = [self archiveParserForHandle:handle resourceFork:fork name:name];
@@ -1593,7 +1593,7 @@ +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle resourceFork:(XAD
 	return nil;
 }
 
--(XADHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum nserror:(NSError * _Nullable *)errorptr
+-(XADHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
 {
 	@try
 	{

diff --git a/XADUnarchiver.m b/XADUnarchiver.m
@@ -43,7 +43,7 @@ +(XADUnarchiver *)unarchiverForPath:(NSString *)path error:(XADError *)errorptr
 	return [[[self alloc] initWithArchiveParser:archiveparser] autorelease];
 }
 
-+(XADUnarchiver *)unarchiverForPath:(NSString *)path nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
++(XADUnarchiver *)unarchiverForPath:(NSString *)path nserror:(NSError **)errorptr
 {
 	XADArchiveParser *archiveparser=[XADArchiveParser archiveParserForPath:path nserror:errorptr];
 	if(!archiveparser) return nil;
@@ -324,7 +324,7 @@ -(XADError)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path f
 }
 
 // FIXME: Improve extractEntryWithDictionary:as:forceDirectories:error: with an NSError value.
--(BOOL)extractEntryWithDictionary:(NSDictionary *)dict as:(nullable NSString *)path forceDirectories:(BOOL)force error:(NSError*__autoreleasing*)outErr
+-(BOOL)extractEntryWithDictionary:(NSDictionary *)dict as:(nullable NSString *)path forceDirectories:(BOOL)force error:(NSError**)outErr
 {
 	__strong NSError *tmpErr = nil;
 	BOOL okay;
@@ -574,7 +574,7 @@ -(XADError)_fixDeferredDirectories
 
 
 -(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict
-wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
+wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
 {
 	return [self unarchiverForEntryWithDictionary:dict resourceForkDictionary:nil
 	wantChecksum:checksum nserror:errorptr];
@@ -608,7 +608,7 @@ -(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict
 
 
 -(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict
-							resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum nserror:(NSError *_Nullable __autoreleasing *_Nullable)errorptr
+							resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr
 {
 	XADArchiveParser *subparser=[XADArchiveParser
 								 archiveParserForEntryWithDictionary:dict
@@ -1006,7 +1006,7 @@ -(XADError)runExtractorWithDictionary:(NSDictionary *)dict
 	return XADErrorNone;
 }
 
--(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *)handle error:(NSError *__autoreleasing  _Nullable * _Nullable)outError
+-(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *)handle error:(NSError **)outError
 {
 	return [self runExtractorWithDictionary:dict outputTarget:self
 	selector:@selector(_outputToHandle:bytes:length:) argument:handle error:outError];