From 6bbfcb7ab6163ad247c683da622ca0bd61169619 Mon Sep 17 00:00:00 2001 From: "C.W. Betts" Date: Thu, 6 Feb 2025 19:50:24 -0700 Subject: [PATCH] More fixes for Linux. --- XADArchiveParser.m | 8 ++++---- XADException.m | 2 +- XADSimpleUnarchiver.m | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/XADArchiveParser.m b/XADArchiveParser.m index 051c14e2..6a2184fb 100644 --- a/XADArchiveParser.m +++ b/XADArchiveParser.m @@ -560,7 +560,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename { // An empty array means scanning failed. Set a flag to // warn the caller, and fall through to single-file mode. - props[XADVolumeScanningFailedKey] = @YES; + [props setValue:[NSNumber numberWithBool:YES] forKey:XADVolumeScanningFailedKey]; } } } @@ -571,7 +571,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename parser.resourceFork = fork; parser.filename = filename.path; - props[XADVolumesKey] = @[filename.path]; + props[XADVolumesKey] = [NSArray arrayWithObject:filename.path]; [parser addPropertiesFromDictionary:props]; return [parser autorelease]; @@ -1550,7 +1550,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError ** return nil; } if (errorptr) { - *errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:@{NSURLErrorKey: filename}]; + *errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:[NSDictionary dictionaryWithObjectsAndKeys:filename, NSURLErrorKey, nil]]; } return nil; } @@ -1569,7 +1569,7 @@ +(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError return nil; } if (errorptr) { - *errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:@{NSFilePathErrorKey: filename}]; + *errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:[NSDictionary dictionaryWithObjectsAndKeys:filename, NSFilePathErrorKey, nil]]; } return nil; } diff --git a/XADException.m b/XADException.m index 8e75e5c4..d21572a8 100644 --- a/XADException.m +++ b/XADException.m @@ -85,7 +85,7 @@ +(NSError*)parseExceptionReturningNSError:(nonnull id)exception { NSException *e=exception; NSString *name=[e name]; - NSMutableDictionary *usrInfo = [NSMutableDictionary dictionaryWithDictionary:e.userInfo ?: @{}]; + NSMutableDictionary *usrInfo = [NSMutableDictionary dictionaryWithDictionary:e.userInfo ?: [NSDictionary dictionary]]; usrInfo[XADExceptionReasonKey] = e.reason; if ([name isEqualToString:XADExceptionName]) { XADError errVal = [[e userInfo][@"XADError"] intValue]; diff --git a/XADSimpleUnarchiver.m b/XADSimpleUnarchiver.m index 3ed5107b..87117c7d 100644 --- a/XADSimpleUnarchiver.m +++ b/XADSimpleUnarchiver.m @@ -328,7 +328,7 @@ -(BOOL)parseWithError:(NSError**)error { if(entries.count) { if (error) { - *error = [NSError errorWithDomain:XADErrorDomain code:XADErrorBadParameters userInfo:@{NSLocalizedDescriptionKey: @"You can not call parseAndUnarchive twice", NSDebugDescriptionErrorKey: @"You can not call parseAndUnarchive twice"}]; + *error = [NSError errorWithDomain:XADErrorDomain code:XADErrorBadParameters userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"You can not call parseAndUnarchive twice", NSLocalizedDescriptionKey, @"You can not call parseAndUnarchive twice", NSDebugDescriptionErrorKey, nil]]; } return NO;