Skip to content

Properly return an error if XML parsing failed #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eunikolsky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Properly return an error if XML parsing failed #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions XMLReader.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,23 @@ @implementation XMLReader

+ (NSDictionary *)dictionaryForXMLData:(NSData *)data error:(NSError **)error
{
XMLReader *reader = [[XMLReader alloc] initWithError:error];
NSDictionary *rootDictionary = [reader objectWithData:data options:0];
return rootDictionary;
return [[self class] dictionaryForXMLData:data options:0 error:error];
}

+ (NSDictionary *)dictionaryForXMLString:(NSString *)string error:(NSError **)error
{
NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
return [XMLReader dictionaryForXMLData:data error:error];
return [XMLReader dictionaryForXMLData:data options:0 error:error];
}

+ (NSDictionary *)dictionaryForXMLData:(NSData *)data options:(XMLReaderOptions)options error:(NSError **)error
{
XMLReader *reader = [[XMLReader alloc] initWithError:error];
NSDictionary *rootDictionary = [reader objectWithData:data options:options];
if (!rootDictionary && error)
{
*error = reader.errorPointer;
}
return rootDictionary;
}

Expand All @@ -59,10 +61,10 @@ + (NSDictionary *)dictionaryForXMLString:(NSString *)string options:(XMLReaderOp

- (id)initWithError:(NSError **)error
{
self = [super init];
self = [super init];
if (self)
{
self.errorPointer = *error;
self.errorPointer = (error ? *error : nil);
}
return self;
}
Expand Down