gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

add _passExternalRetainsTo: to transfer extra retains when a top node is added to a new tree

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/nsxml_using_libxml2@34628 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Doug Simons 2012-01-25 18:22:56 +00:00
parent e7febfce47
commit 2917fb9f3c
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Source/NSXMLNode.m
View file

@ -101,12 +101,27 @@ GS_PRIVATE_INTERNAL(NSXMLNode)
return result;
}
- (void) _passExternalRetainsTo:(NSXMLNode *)parent
{
// this object just became a subNode, so pass responsibility for external retains up the line
BOOL releaseSelf = (internal->externalRetains > 0); // if we've retained ourself
while (internal->externalRetains--)
{
[parent recordExternalRetain];
}
if (releaseSelf)
[self release];
}
- (void) _addSubNode:(NSXMLNode *)subNode
{
if (!internal->subNodes)
internal->subNodes = [[NSMutableArray alloc] init];
if ([internal->subNodes indexOfObjectIdenticalTo:subNode] == NSNotFound)
[internal->subNodes addObject:subNode];
{
[internal->subNodes addObject:subNode];
[subNode _passExternalRetainsTo:self];
}
}
- (void) _removeSubNode:(NSXMLNode *)subNode
@ -542,6 +557,8 @@ NSArray *execute_xpath(NSXMLNode *node,
[parent releaseExternalRetain];
else
{
if (internal->externalRetains <=0)
NSLog(@"ExternalRetains going NEGATIVE: %d in %@", internal->externalRetains - 1, self);
internal->externalRetains--;
if (internal->externalRetains == 0)
[super release]; // the top of the tree retains itself whenever there are external retains anywhere
@ -577,7 +594,7 @@ NSArray *execute_xpath(NSXMLNode *node,
[internal->URI release];
[internal->objectValue release];
[internal->subNodes release];
if (node->parent == NULL)
if (node && node->parent == NULL)
{
xmlFree(node); // the top level node frees the entire tree
}