gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-25 01:31:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix fred's suggestions. Put guard and make more general method the one which is called.

Browse source
This commit is contained in:
Gregory John Casamento 2020-05-12 14:01:44 -04:00
parent 9d252bd5b6
commit be8980dfb4
2 changed files with 49 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Headers/Foundation/NSKeyedArchiver.h
View file

@ -88,6 +88,7 @@ extern "C" {
+ (NSData*) archivedDataWithRootObject: (id)anObject;
#if OS_API_VERSION(MAC_OS_X_VERSION_10_13,GS_API_LATEST)
/**
* Encodes anObject and returns the resulting data object. Allows
* secure coding if specified. Returns an error if an object
@ -96,6 +97,7 @@ extern "C" {
+ (NSData *) archivedDataWithRootObject: (id)anObject
requiringSecureCoding: (BOOL)requiresSecureCoding
error: (NSError **)error;
#endif
/**
* Encodes anObject and writes the resulting data ti aPath.

54
Source/NSKeyedArchiver.m
View file

@ -430,16 +430,27 @@ static NSDictionary *makeReference(unsigned ref)
@implementation NSKeyedArchiver
/*
* When I tried this on MacOS 10.3 it encoded the object with the key 'root',
* so this implementation does the same.
*/
+ (NSData*) archivedDataWithRootObject: (id)anObject
+ (NSData *) archivedDataWithRootObject: (id)anObject
requiringSecureCoding: (BOOL)requiresSecureCoding
error: (NSError **)error
{
NSMutableData *m = nil;
NSKeyedArchiver *a = nil;
NSData *d = nil;
if (requiresSecureCoding == YES)
{
if (error != NULL)
{
*error = [NSError errorWithDomain: @"NSKeyedArchiver"
code: 0
userInfo: nil];
}
}
else
{
NSMutableData *m = nil;
NSKeyedArchiver *a = nil;
error = NULL;
NS_DURING
{
m = [[NSMutableData alloc] initWithCapacity: 10240];
@ -456,30 +467,23 @@ static NSDictionary *makeReference(unsigned ref)
DESTROY(a);
[localException raise];
}
NS_ENDHANDLER
NS_ENDHANDLER;
}
return AUTORELEASE(d);
}
+ (NSData *) archivedDataWithRootObject: (id)anObject
requiringSecureCoding: (BOOL)requiresSecureCoding
error: (NSError **)error
/*
* When I tried this on MacOS 10.3 it encoded the object with the key 'root',
* so this implementation does the same.
*/
+ (NSData*) archivedDataWithRootObject: (id)anObject
{
NSData *data = nil;
if (requiresSecureCoding == YES)
{
*error = [NSError errorWithDomain: @"NSKeyedArchiver"
code: 0
userInfo: nil];
}
else
{
error = NULL;
data = [self archivedDataWithRootObject: anObject];
}
return data;
return [self archivedDataWithRootObject: anObject
requiringSecureCoding: NO
error: NULL];
}
+ (BOOL) archiveRootObject: (id)anObject toFile: (NSString*)aPath
{
NSAutoreleasePool *pool = [NSAutoreleasePool new];