gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Save and restore libxml global info

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17457 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2003-08-08 14:55:23 +00:00
parent d5867fd5a6
commit 1fe59c7aa5
2 changed files with 62 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-08-08 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSXML.m: save and restore libxml global settings
before/after each parse operation.
2003-08-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSString.m: nodeToObject() fix error in handling escape

65
Source/Additions/GSXML.m
View file

@ -49,6 +49,7 @@
#include <Foundation/NSData.h>
#include <Foundation/NSValue.h>
#include <Foundation/NSURL.h>
#include <Foundation/NSHashTable.h>
#include <Foundation/NSMapTable.h>
#include <Foundation/NSException.h>
#include <Foundation/NSBundle.h>
@ -69,7 +70,6 @@
#include <libxml/xmlmemory.h>
#include <libxml/xpath.h>
extern int xmlDoValidityCheckingDefaultValue;
extern int xmlGetWarningsDefaultValue;
/*
@ -1643,13 +1643,21 @@ static NSMapTable *nodeNames = 0;
*/
@implementation GSXMLParser
static NSMapTable *warnings = 0;
static NSString *endMarker = @"At end of incremental parse";
+ (void) initialize
{
if (cacheDone == NO)
setupCache();
xmlSetExternalEntityLoader((xmlExternalEntityLoader)loadEntityFunction);
static BOOL beenHere = NO;
if (beenHere == NO)
{
beenHere = YES;
if (cacheDone == NO)
setupCache();
warnings = NSCreateHashTable(NSNonRetainedObjectHashCallBacks, 0);
}
}
/**
@ -1863,6 +1871,7 @@ static NSString *endMarker = @"At end of incremental parse";
- (void) dealloc
{
NSHashRemove(warnings, self);
RELEASE(messages);
RELEASE(src);
RELEASE(saxHandler);
@ -1911,7 +1920,21 @@ static NSString *endMarker = @"At end of incremental parse";
*/
- (BOOL) getWarnings: (BOOL)yesno
{
return !(xmlGetWarningsDefaultValue = yesno);
BOOL old = YES;
if (NSHashGet(warnings, self) == nil)
{
old = NO;
}
if (yesno == YES && old == NO)
{
NSHashInsert(warnings, self);
}
else if (yesno == NO && old == YES)
{
NSHashRemove(warnings, self);
}
return old;
}
/**
@ -2181,7 +2204,7 @@ static NSString *endMarker = @"At end of incremental parse";
*/
if (lib != NULL)
{
xmlParseChunk(lib, 0, 0, 1);
[self _parseChunk: nil];
src = endMarker;
if (((xmlParserCtxtPtr)lib)->wellFormed)
return YES;
@ -2299,10 +2322,36 @@ static NSString *endMarker = @"At end of incremental parse";
return messages;
}
// nil data allowed
- (void) _parseChunk: (NSData*)data
{
// nil data allowed
xmlParseChunk(lib, [data bytes], [data length], data == nil);
xmlExternalEntityLoader oldLoader;
int oldWarnings;
oldLoader = xmlGetExternalEntityLoader();
oldWarnings = xmlGetWarningsDefaultValue;
NS_DURING
{
if (NSHashGet(warnings, self) == nil)
{
xmlGetWarningsDefaultValue = 0;
}
else
{
xmlGetWarningsDefaultValue = 1;
}
xmlSetExternalEntityLoader((xmlExternalEntityLoader)loadEntityFunction);
xmlParseChunk(lib, [data bytes], [data length], data == nil);
xmlSetExternalEntityLoader(oldLoader);
xmlGetWarningsDefaultValue = oldWarnings;
}
NS_HANDLER
{
xmlSetExternalEntityLoader(oldLoader);
xmlGetWarningsDefaultValue = oldWarnings;
[localException raise];
}
NS_ENDHANDLER
}
@end