Tidied xml parsing

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@7480 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 2000-09-12 10:34:49 +00:00
parent 605b1c2dd0
commit 1bfa5baeb9
2 changed files with 15 additions and 13 deletions

View file

@ -374,7 +374,7 @@ setupCache()
+ (GSXMLNode*) nodeFrom: (void*)data
{
return AUTORELEASE([[self alloc] nodeFrom: data]);
return AUTORELEASE([[self alloc] initFrom: data]);
}
- (id) initFrom: (void*)data
@ -786,9 +786,8 @@ setupCache()
}
if ([src isKindOfClass: [NSData class]])
{
NSLog(@"parse data length %d", [src length]);
NSLog(@"parse data %*s", [src length], [src bytes]);
lib = (void*)xmlCreateMemoryParserCtxt((void*)[src bytes], [src length]);
lib = (void*)xmlCreateMemoryParserCtxt((void*)[src bytes],
[src length]-1);
if (lib == NULL)
{
NSLog(@"out of memory");

View file

@ -768,9 +768,12 @@ static id parsePl(pldata* pld)
{
NSData *data;
GSXMLParser *parser;
char *buf = NSZoneMalloc(NSDefaultMallocZone(), pld->end+1);
data = [NSData dataWithBytes: pld->ptr length: pld->end];
NSLog(@"Parsing '%*s'", pld->end, pld->ptr);
memcpy(buf, pld->ptr, pld->end);
buf[pld->end] = '\0';
data = [NSData dataWithBytesNoCopy: buf length: pld->end+1];
NSLog(@"Parsing '%s'", buf);
parser = [GSXMLParser parser: data];
if ([parser parse] == YES)
{