Skip to content

Commit ef6aa4d

Browse files
committed
More fixes for Linux.
1 parent df0b0d8 commit ef6aa4d

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

XADArchiveParser.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename
560560
{
561561
// An empty array means scanning failed. Set a flag to
562562
// warn the caller, and fall through to single-file mode.
563-
props[XADVolumeScanningFailedKey] = @YES;
563+
[props setValue:[NSNumber numberWithBool:YES] forKey:XADVolumeScanningFailedKey];
564564
}
565565
}
566566
}
@@ -571,7 +571,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename
571571
parser.resourceFork = fork;
572572
parser.filename = filename.path;
573573

574-
props[XADVolumesKey] = @[filename.path];
574+
props[XADVolumesKey] = [NSArray arrayWithObject:filename.path];
575575
[parser addPropertiesFromDictionary:props];
576576

577577
return [parser autorelease];
@@ -1067,7 +1067,7 @@ + (void)throwExceptionFromError:(NSError *)error
10671067
return;
10681068
}
10691069
NSMutableDictionary *exceptionUserInfo = [error.userInfo mutableCopy];
1070-
exceptionUserInfo[@"XADError"] = @((XADError)error.code);
1070+
[exceptionUserInfo setValue:[NSNumber numberWithInt:(XADError)error.code] forKey:@"XADError"];
10711071
[[[NSException alloc] initWithName:XADExceptionName reason:[XADException describeXADError:(XADError)error.code]
10721072
userInfo:exceptionUserInfo] raise];
10731073

@@ -1550,7 +1550,7 @@ +(XADArchiveParser *)archiveParserForFileURL:(NSURL *)filename error:(NSError **
15501550
return nil;
15511551
}
15521552
if (errorptr) {
1553-
*errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:@{NSURLErrorKey: filename}];
1553+
*errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:[NSDictionary dictionaryWithObjectsAndKeys:filename, NSURLErrorKey, nil]];
15541554
}
15551555
return nil;
15561556
}
@@ -1569,7 +1569,7 @@ +(XADArchiveParser *)archiveParserForPath:(NSString *)filename nserror:(NSError
15691569
return nil;
15701570
}
15711571
if (errorptr) {
1572-
*errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:@{NSFilePathErrorKey: filename}];
1572+
*errorptr = [NSError errorWithDomain:XADErrorDomain code:XADErrorNotSupported userInfo:[NSDictionary dictionaryWithObjectsAndKeys:filename, NSFilePathErrorKey, nil]];
15731573
}
15741574
return nil;
15751575
}

XADException.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ +(NSError*)parseExceptionReturningNSError:(nonnull id)exception
8585
{
8686
NSException *e=exception;
8787
NSString *name=[e name];
88-
NSMutableDictionary *usrInfo = [NSMutableDictionary dictionaryWithDictionary:e.userInfo ?: @{}];
88+
NSMutableDictionary *usrInfo = [NSMutableDictionary dictionaryWithDictionary:e.userInfo ?: [NSDictionary dictionary]];
8989
usrInfo[XADExceptionReasonKey] = e.reason;
9090
if ([name isEqualToString:XADExceptionName]) {
9191
XADError errVal = [[e userInfo][@"XADError"] intValue];

XADSimpleUnarchiver.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ -(BOOL)parseWithError:(NSError**)error
328328
{
329329
if(entries.count) {
330330
if (error) {
331-
*error = [NSError errorWithDomain:XADErrorDomain code:XADErrorBadParameters userInfo:@{NSLocalizedDescriptionKey: @"You can not call parseAndUnarchive twice", NSDebugDescriptionErrorKey: @"You can not call parseAndUnarchive twice"}];
331+
*error = [NSError errorWithDomain:XADErrorDomain code:XADErrorBadParameters userInfo:[NSDictionary dictionaryWithObjectsAndKeys:@"You can not call parseAndUnarchive twice", NSLocalizedDescriptionKey, @"You can not call parseAndUnarchive twice", NSDebugDescriptionErrorKey, nil]];
332332
}
333333

334334
return NO;

0 commit comments

Comments
 (0)