gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 16:50:58 +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:
CaS 2003-08-08 14:55:23 +00:00
parent 76b458f3e8
commit 8bdabb6055
2 changed files with 62 additions and 8 deletions
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> 2003-08-07 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSString.m: nodeToObject() fix error in handling escape * 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/NSData.h>
#include <Foundation/NSValue.h> #include <Foundation/NSValue.h>
#include <Foundation/NSURL.h> #include <Foundation/NSURL.h>
#include <Foundation/NSHashTable.h>
#include <Foundation/NSMapTable.h> #include <Foundation/NSMapTable.h>
#include <Foundation/NSException.h> #include <Foundation/NSException.h>
#include <Foundation/NSBundle.h> #include <Foundation/NSBundle.h>
@ -69,7 +70,6 @@
#include <libxml/xmlmemory.h> #include <libxml/xmlmemory.h>
#include <libxml/xpath.h> #include <libxml/xpath.h>
extern int xmlDoValidityCheckingDefaultValue;
extern int xmlGetWarningsDefaultValue; extern int xmlGetWarningsDefaultValue;
/* /*
@ -1643,13 +1643,21 @@ static NSMapTable *nodeNames = 0;
*/ */
@implementation GSXMLParser @implementation GSXMLParser
static NSMapTable *warnings = 0;
static NSString *endMarker = @"At end of incremental parse"; static NSString *endMarker = @"At end of incremental parse";
+ (void) initialize + (void) initialize
{ {
if (cacheDone == NO) static BOOL beenHere = NO;
setupCache();
xmlSetExternalEntityLoader((xmlExternalEntityLoader)loadEntityFunction); 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 - (void) dealloc
{ {
NSHashRemove(warnings, self);
RELEASE(messages); RELEASE(messages);
RELEASE(src); RELEASE(src);
RELEASE(saxHandler); RELEASE(saxHandler);
@ -1911,7 +1920,21 @@ static NSString *endMarker = @"At end of incremental parse";
*/ */
- (BOOL) getWarnings: (BOOL)yesno - (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) if (lib != NULL)
{ {
xmlParseChunk(lib, 0, 0, 1); [self _parseChunk: nil];
src = endMarker; src = endMarker;
if (((xmlParserCtxtPtr)lib)->wellFormed) if (((xmlParserCtxtPtr)lib)->wellFormed)
return YES; return YES;
@ -2299,10 +2322,36 @@ static NSString *endMarker = @"At end of incremental parse";
return messages; return messages;
} }
// nil data allowed
- (void) _parseChunk: (NSData*)data - (void) _parseChunk: (NSData*)data
{ {
// nil data allowed xmlExternalEntityLoader oldLoader;
xmlParseChunk(lib, [data bytes], [data length], data == nil); 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 @end