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

Minor optimisation

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12525 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-02-13 18:27:05 +00:00
parent 77daab90de
commit 84c45257a4
2 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -2,6 +2,8 @@
* Source/NSString.m: ([stringByExpandingTildeInPath]) fix bug in
handling ~username/... format.
* Headers/Foundation/GSIMap.h: GSIMapCleanMap() rewrote to empty
the map efficiently.
2002-02-12 Richard Frith-Macdonald <rfm@gnu.org>

48
Headers/gnustep/base/GSIMap.h
View file

@ -65,7 +65,6 @@
* map table whose type is that specified by the value of the
* preprocessor constant. This field can be used
* to store additional information for the map.
*
*/
#ifndef GSI_MAP_HAS_VALUE
@ -158,6 +157,10 @@
#define GSUNION_EXTRA GSI_MAP_VEXTRA
#endif
#ifndef GSI_MAP_SIMPLE
#define GSI_MAP_SIMPLE 0
#endif
/*
* Generate the union typedef
*/
@ -688,22 +691,39 @@ GSIMapRemoveKey(GSIMapTable map, GSIMapKey key)
static INLINE void
GSIMapCleanMap(GSIMapTable map)
{
GSIMapBucket bucket = map->buckets;
int i;
for (i = 0; i < map->bucketCount; i++)
if (map->nodeCount > 0)
{
while (bucket->nodeCount != 0)
{
GSIMapNode node = bucket->firstNode;
GSIMapBucket bucket = map->buckets;
int i;
GSIMapNode start = map->firstNode;
GSIMapNode node = start;
unsigned int end = map->nodeCount - 1;
GSIMapRemoveNodeFromMap(map, bucket, node);
GSIMapFreeNode(map, node);
map->nodeCount = 0;
map->firstNode = 0;
for (i = 0; i < map->bucketCount; i++)
{
bucket->nodeCount = 0;
bucket->firstNode = 0;
bucket++;
}
bucket++;
}
map->firstNode = 0;
map->nodeCount = 0;
for (i = 0; i < end; i++)
{
GSI_MAP_RELEASE_KEY(map, node->key);
#if GSI_MAP_HAS_VALUE
GSI_MAP_RELEASE_VAL(map, node->val);
#endif
node->nextInBucket = 0;
node = node->nextInMap;
}
GSI_MAP_RELEASE_KEY(map, node->key);
#if GSI_MAP_HAS_VALUE
GSI_MAP_RELEASE_VAL(map, node->val);
#endif
node->nextInBucket = 0;
node->nextInMap = map->freeNodes;
map->freeNodes = start;
}
}
static INLINE void