mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 16:50:58 +00:00
check for nil
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37318 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
07152c53ae
commit
5ecbbfe3bb
1 changed files with 46 additions and 38 deletions
|
@ -131,6 +131,8 @@ static IMP unlockImp;
|
|||
*/
|
||||
static NSDictionary*
|
||||
cacheAttributes(NSDictionary *attrs)
|
||||
{
|
||||
if (nil != attrs)
|
||||
{
|
||||
GSIMapNode node;
|
||||
|
||||
|
@ -138,12 +140,13 @@ cacheAttributes(NSDictionary *attrs)
|
|||
node = GSIMapNodeForKey(&attrMap, (GSIMapKey)((id)attrs));
|
||||
if (node == 0)
|
||||
{
|
||||
/*
|
||||
* Shallow copy of dictionary, without copying objects ... results
|
||||
* in an immutable dictionary that can safely be cached.
|
||||
/* Shallow copy of dictionary, without copying objects ....
|
||||
* result in an immutable dictionary that can safely be cached.
|
||||
*/
|
||||
attrs = [[NSDictionary alloc] initWithDictionary: attrs copyItems: NO];
|
||||
GSIMapAddPair(&attrMap, (GSIMapKey)((id)attrs), (GSIMapVal)(NSUInteger)1);
|
||||
attrs = [[NSDictionary alloc] initWithDictionary: attrs
|
||||
copyItems: NO];
|
||||
GSIMapAddPair(&attrMap,
|
||||
(GSIMapKey)((id)attrs), (GSIMapVal)(NSUInteger)1);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -151,6 +154,7 @@ cacheAttributes(NSDictionary *attrs)
|
|||
attrs = RETAIN(node->key.obj);
|
||||
}
|
||||
AUNLOCK();
|
||||
}
|
||||
return attrs;
|
||||
}
|
||||
|
||||
|
@ -159,6 +163,8 @@ cacheAttributes(NSDictionary *attrs)
|
|||
*/
|
||||
static void
|
||||
unCacheAttributes(NSDictionary *attrs)
|
||||
{
|
||||
if (nil != attrs)
|
||||
{
|
||||
GSIMapBucket bucket;
|
||||
NSDictionary *found;
|
||||
|
@ -170,7 +176,8 @@ unCacheAttributes(NSDictionary *attrs)
|
|||
{
|
||||
GSIMapNode node;
|
||||
|
||||
node = GSIMapNodeForKeyInBucket(&attrMap, bucket, (GSIMapKey)((id)attrs));
|
||||
node = GSIMapNodeForKeyInBucket(&attrMap,
|
||||
bucket, (GSIMapKey)((id)attrs));
|
||||
if (node != 0)
|
||||
{
|
||||
found = node->key.obj;
|
||||
|
@ -185,6 +192,7 @@ unCacheAttributes(NSDictionary *attrs)
|
|||
NSCAssert(found == attrs, NSInternalInconsistencyException);
|
||||
RELEASE(found);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue