Replace last change by a better one.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@34829 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
fredkiefer 2012-02-27 18:35:38 +00:00
parent 6e4e57e690
commit 3b76abbaae
4 changed files with 15 additions and 22 deletions

View file

@ -76,7 +76,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (NSString*) characterEncoding
{
if (MY_DOC->encoding)
return [NSString stringWithUTF8String: (const char *)MY_DOC->encoding];
return StringFromXMLStringPtr(MY_DOC->encoding);
else
return nil;
}
@ -229,7 +229,7 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (void) setCharacterEncoding: (NSString*)encoding
{
MY_DOC->encoding = xmlStrdup(XMLSTRING(encoding));
MY_DOC->encoding = XMLStringCopy(encoding);
}
- (void) setDocumentContentKind: (NSXMLDocumentContentKind)kind
@ -475,12 +475,11 @@ extern void clearPrivatePointers(xmlNodePtr aNode);
- (id) copyWithZone: (NSZone *)zone
{
id c = [[self class] allocWithZone: zone];
xmlDocPtr newNode = xmlCopyDoc(MY_DOC, 1); // make a deep copy
clearPrivatePointers((xmlNodePtr)newNode);
c = [c _initWithNode:(xmlNodePtr)newNode kind:internal->kind];
NSXMLDocument *c = (NSXMLDocument*)[super copyWithZone: zone];
[c setMIMEType: [self MIMEType]];
[c setDTD: [self DTD]];
[c setDocumentContentKind: [self documentContentKind]];
return c;
}