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

* Headers/GNUstepBase/GSIMap.h: Use GSI_MAP_NODE_IS_EMPTY macros

Browse source 
when checking in enumerator.
* Source/NSConcreteHashTable.m,
* Source/NSConcreteMapTable.m: Revert part of the weak pointer change.
This commit is contained in:
fredkiefer 2019-12-15 13:40:51 +01:00
parent 834e915b6d
commit d1cf30dd9f
4 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2019-12-15 Fred Kiefer <fredkiefer@gmx.de>
* Headers/GNUstepBase/GSIMap.h: Use GSI_MAP_NODE_IS_EMPTY macros
when checking in enumerator.
* Source/NSConcreteHashTable.m,
* Source/NSConcreteMapTable.m: Revert part of the weak pointer change.
2019-10-17 Frederik Seiffert <frederik@algoriddim.com>
* Tests/base/NSHashTable/weakObjects.m:

4
Headers/GNUstepBase/GSIMap.h
View file

@ -945,7 +945,7 @@ GSIMapEnumeratorNextNode(GSIMapEnumerator enumerator)
{
uintptr_t bucket = ((_GSIE)enumerator)->bucket;
while (next != 0 && next->key.addr == 0)
while (next != 0 && GSI_MAP_NODE_IS_EMPTY(map, next))
{
next = GSIMapRemoveAndFreeNode(map, bucket, next);
}
@ -961,7 +961,7 @@ GSIMapEnumeratorNextNode(GSIMapEnumerator enumerator)
while (next == 0 && ++bucket < bucketCount)
{
next = (map->buckets[bucket]).firstNode;
while (next != 0 && next->key.addr == 0)
while (next != 0 && GSI_MAP_NODE_IS_EMPTY(map, next))
{
next = GSIMapRemoveAndFreeNode(map, bucket, next);
}

8
Source/NSConcreteHashTable.m
View file

@ -627,13 +627,7 @@ NSNextHashEnumeratorItem(NSHashEnumerator *enumerator)
}
else
{
NSConcreteHashTable *map = enumerator->map;
GSIMapKey k = GSI_MAP_READ_KEY(map, &n->key);
if (k.ptr == NULL)
{
return NSNextHashEnumeratorItem(enumerator);
}
return k.ptr;
return n->key.ptr;
}
}
else if (enumerator->node != 0) // Got an enumerator object

24
Source/NSConcreteMapTable.m
View file

@ -882,17 +882,23 @@ NSNextMapEnumeratorPair(NSMapEnumerator *enumerator,
}
else
{
NSConcreteMapTable *map = enumerator->map;
GSIMapKey k = GSI_MAP_READ_KEY(map, &n->key);
GSIMapVal v = GSI_MAP_READ_VALUE(map, &n->value);
if (k.ptr == NULL || v.ptr == NULL)
{
return NSNextMapEnumeratorPair(enumerator, key, value);
if (key != 0)
{
*key = n->key.ptr;
}
else
{
NSWarnFLog(@"Null key return address");
}
*key = k.ptr;
*value = v.ptr;
if (value != 0)
{
*value = n->value.ptr;
}
else
{
NSWarnFLog(@"Null value return address");
}
return YES;
}
}