From bcc60ad99666ac2936cbbe1f8d29667c548d4380 Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Thu, 6 Feb 2025 19:25:03 -0700 Subject: [PATCH] Fix some oversights noticed when trying to build on Linux. --- XADArchiveParser.h | 6 +++--- XADArchiveParser.m | 2 +- XADTypes.h | 1 + XADUnarchiver.h | 16 ++++++++-------- XADUnarchiver.m | 6 +++--- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/XADArchiveParser.h b/XADArchiveParser.h index 06875b29..cf4125ec 100644 --- a/XADArchiveParser.h +++ b/XADArchiveParser.h @@ -150,7 +150,7 @@ resourceFork:(XADResourceFork *)fork name:(NSString *)name propertiesToAdd:(NSMu #pragma mark NSError functions +(XADArchiveParser *)archiveParserForHandle:(CSHandle *)handle name:(NSString *)name nserror:(NSError **)errorptr NS_SWIFT_NAME(archiveParser(for:name:)); -+(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry ++(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry archiveParser:(XADArchiveParser *)parser wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr NS_SWIFT_NAME(archiveParser(with:archiveParser:wantChecksum:)); +(XADArchiveParser *)archiveParserForEntryWithDictionary:(NSDictionary *)entry @@ -225,7 +225,7 @@ regex:(XADRegex *)regex firstFileExtension:(NSString *)firstext; -(CSHandle *)subHandleFromSolidStreamForEntryWithDictionary:(NSDictionary *)dict; @property (NS_NONATOMIC_IOSONLY, readonly) BOOL hasVolumes; -@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSArray *volumeSizes; +@property (NS_NONATOMIC_IOSONLY, readonly, copy) NSArray *volumeSizes; @property (NS_NONATOMIC_IOSONLY, readonly, retain) CSHandle *currentHandle; -(void)setObject:(id)object forPropertyKey:(XADArchiveKeys)key; @@ -291,7 +291,7 @@ name:(NSString *)name; //! requested parsing to stop. -(BOOL)parseWithError:(NSError**)error; //! Exception-free wrapper for subclass method. --(CSHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr ; +-(CSHandle *)handleForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr ; @end diff --git a/XADArchiveParser.m b/XADArchiveParser.m index 5e7a1d48..44db1865 100644 --- a/XADArchiveParser.m +++ b/XADArchiveParser.m @@ -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 * _Nullable *)errorptr { @try { diff --git a/XADTypes.h b/XADTypes.h index 189f4c0f..b3f22098 100644 --- a/XADTypes.h +++ b/XADTypes.h @@ -165,6 +165,7 @@ #if !defined(NSFoundationVersionNumber10_11_Max) && !defined(NSFoundationVersionNumber_iOS_9_x_Max) typedef NSString * NSExceptionName NS_TYPED_EXTENSIBLE_ENUM; +typedef NSString * NSErrorUserInfoKey NS_TYPED_EXTENSIBLE_ENUM; #endif #endif /* XADTypes_h */ diff --git a/XADUnarchiver.h b/XADUnarchiver.h index 9f7d5ad5..25206496 100644 --- a/XADUnarchiver.h +++ b/XADUnarchiver.h @@ -85,7 +85,7 @@ XADEXPORT -(XADError)extractEntryWithDictionary:(NSDictionary *)dict forceDirectories:(BOOL)force; -(XADError)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path; -(XADError)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path forceDirectories:(BOOL)force; --(BOOL)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path forceDirectories:(BOOL)force error:(NSError **)outErr; +-(BOOL)extractEntryWithDictionary:(NSDictionary *)dict as:(NSString *)path forceDirectories:(BOOL)force error:(NSError **)outErr; -(XADError)finishExtractions; -(XADError)_fixDeferredLinks; @@ -95,10 +95,10 @@ XADEXPORT wantChecksum:(BOOL)checksum error:(XADError *)errorptr; -(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum error:(XADError *)errorptr; --(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict +-(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr; --(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict -resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum +-(XADUnarchiver *)unarchiverForEntryWithDictionary:(NSDictionary *)dict +resourceForkDictionary:(NSDictionary *)forkdict wantChecksum:(BOOL)checksum nserror:(NSError **)errorptr; -(XADError)_extractFileEntryWithDictionary:(NSDictionary *)dict as:(NSString *)destpath; @@ -114,9 +114,9 @@ deferDirectories:(BOOL)defer; -(XADError)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *)handle; -(XADError)runExtractorWithDictionary:(NSDictionary *)dict outputTarget:(id)target selector:(SEL)sel argument:(id)arg; --(BOOL)runExtractorWithDictionary:(NSDictionary *)dict +-(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *)handle error:(NSError**)outError; --(BOOL)runExtractorWithDictionary:(NSDictionary *)dict +-(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputTarget:(id)target selector:(SEL)sel argument:(id)arg error:(NSError**)outError; -(NSString *)adjustPathString:(NSString *)path forEntryWithDictionary:(NSDictionary *)dict; @@ -136,7 +136,7 @@ outputTarget:(id)target selector:(SEL)sel argument:(id)arg error:(NSError**)outE -(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldExtractEntryWithDictionary:(NSDictionary *)dict suggestedPath:(NSString **)pathptr; -(void)unarchiver:(XADUnarchiver *)unarchiver willExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path; -(void)unarchiver:(XADUnarchiver *)unarchiver didExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path error:(XADError)error; --(void)unarchiver:(XADUnarchiver *)unarchiver didExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path nserror:(NSError*)error; +-(void)unarchiver:(XADUnarchiver *)unarchiver didExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path nserror:(NSError*)error; @required -(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldCreateDirectory:(NSString *)directory; @@ -148,7 +148,7 @@ outputTarget:(id)target selector:(SEL)sel argument:(id)arg error:(NSError**)outE -(BOOL)unarchiver:(XADUnarchiver *)unarchiver shouldExtractArchiveEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path; -(void)unarchiver:(XADUnarchiver *)unarchiver willExtractArchiveEntryWithDictionary:(NSDictionary *)dict withUnarchiver:(XADUnarchiver *)subunarchiver to:(NSString *)path; -(void)unarchiver:(XADUnarchiver *)unarchiver didExtractArchiveEntryWithDictionary:(NSDictionary *)dict withUnarchiver:(XADUnarchiver *)subunarchiver to:(NSString *)path error:(XADError)error; --(void)unarchiver:(XADUnarchiver *)unarchiver didExtractArchiveEntryWithDictionary:(NSDictionary *)dict withUnarchiver:(XADUnarchiver *)subunarchiver to:(NSString *)path nserror:(NSError*)error; +-(void)unarchiver:(XADUnarchiver *)unarchiver didExtractArchiveEntryWithDictionary:(NSDictionary *)dict withUnarchiver:(XADUnarchiver *)subunarchiver to:(NSString *)path nserror:(NSError*)error; @required -(NSString *)unarchiver:(XADUnarchiver *)unarchiver destinationForLink:(XADString *)link from:(NSString *)path; diff --git a/XADUnarchiver.m b/XADUnarchiver.m index b3b82939..fdab0370 100644 --- a/XADUnarchiver.m +++ b/XADUnarchiver.m @@ -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*__autoreleasing*)outErr { __strong NSError *tmpErr = nil; BOOL okay; @@ -1012,7 +1012,7 @@ -(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputHandle:(CSHandle *) selector:@selector(_outputToHandle:bytes:length:) argument:handle error:outError]; } --(BOOL)runExtractorWithDictionary:(NSDictionary *)dict +-(BOOL)runExtractorWithDictionary:(NSDictionary *)dict outputTarget:(id)target selector:(SEL)selector argument:(id)argument error:(NSError**)outError; { XADError (*outputfunc)(id,SEL,id,uint8_t *,int); @@ -1230,7 +1230,7 @@ -(void)unarchiver:(XADUnarchiver *)unarchiver didExtractArchiveEntryWithDictiona } } --(void)unarchiver:(XADUnarchiver *)unarchiver didExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path error:(XADError)error +-(void)unarchiver:(XADUnarchiver *)unarchiver didExtractEntryWithDictionary:(NSDictionary *)dict to:(NSString *)path error:(XADError)error { if ([self respondsToSelector:@selector(unarchiver:didExtractEntryWithDictionary:to:nserror:)]) { [(NSObject*)self unarchiver:unarchiver didExtractEntryWithDictionary:dict to:path nserror:error == XADErrorNone ? nil : [NSError errorWithDomain:XADErrorDomain code:error userInfo:nil]];