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

Tidyups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12382 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-02-02 07:40:35 +00:00
parent bba7ad343f
commit 15fb3973a2
4 changed files with 48 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2002-02-02 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSObject.m: Fix some maptable problems when using non-local
reference counts.
* Source/NSMapTable.m: Improve warning logging for dodgy practices.
* Source/NSHashTable.m: ditto
2002-02-01 Richard Frith-Macdonald <rfm@gnu.org>
* Documentation/manual: New directory containing Objective-C and

26
Source/NSHashTable.m
View file

@ -71,7 +71,7 @@ NSAllHashTableObjects(NSHashTable *table)
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return nil;
}
@ -107,12 +107,12 @@ NSCompareHashTables(NSHashTable *table1, NSHashTable *table2)
}
if (t1 == 0)
{
NSWarnLog(@"Nul first argument supplied");
NSWarnFLog(@"Nul first argument supplied");
return NO;
}
if (t2 == 0)
{
NSWarnLog(@"Nul second argument supplied");
NSWarnFLog(@"Nul second argument supplied");
return NO;
}
@ -147,7 +147,7 @@ NSCopyHashTableWithZone(NSHashTable *table, NSZone *zone)
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return 0;
}
@ -172,7 +172,7 @@ NSCountHashTable(NSHashTable *table)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return 0;
}
return ((GSIMapTable)table)->nodeCount;
@ -232,7 +232,7 @@ NSEndHashTableEnumeration(NSHashEnumerator *enumerator)
{
if (enumerator == 0)
{
NSWarnLog(@"Nul enumerator argument supplied");
NSWarnFLog(@"Nul enumerator argument supplied");
}
}
@ -247,7 +247,7 @@ NSEnumerateHashTable(NSHashTable *table)
{
NSHashEnumerator v = { 0, 0 };
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return v;
}
else
@ -264,7 +264,7 @@ NSFreeHashTable(NSHashTable *table)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
}
else
{
@ -286,7 +286,7 @@ NSHashGet(NSHashTable *table, const void *element)
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return 0;
}
n = GSIMapNodeForKey((GSIMapTable)table, (GSIMapKey)element);
@ -398,7 +398,7 @@ NSHashRemove(NSHashTable *table, const void *element)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
}
else
{
@ -417,7 +417,7 @@ NSNextHashEnumeratorItem(NSHashEnumerator *enumerator)
if (enumerator == 0)
{
NSWarnLog(@"Nul enumerator argument supplied");
NSWarnFLog(@"Nul enumerator argument supplied");
return 0;
}
n = GSIMapEnumeratorNextNode((GSIMapEnumerator)enumerator);
@ -439,7 +439,7 @@ NSResetHashTable(NSHashTable *table)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
}
else
{
@ -463,7 +463,7 @@ NSStringFromHashTable(NSHashTable *table)
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return nil;
}

45
Source/NSMapTable.m
View file

@ -80,10 +80,11 @@ NSAllMapTableKeys(NSMapTable *table)
NSMutableArray *keyArray;
NSMapEnumerator enumerator;
id key = nil;
void *dummy;
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return nil;
}
@ -94,7 +95,7 @@ NSAllMapTableKeys(NSMapTable *table)
enumerator = NSEnumerateMapTable(table);
/* Step through TABLE... */
while (NSNextMapEnumeratorPair(&enumerator, (void **)(&key), 0))
while (NSNextMapEnumeratorPair(&enumerator, (void **)(&key), &dummy))
{
[keyArray addObject: key];
}
@ -111,10 +112,11 @@ NSAllMapTableValues(NSMapTable *table)
NSMapEnumerator enumerator;
NSMutableArray *valueArray;
id value = nil;
void *dummy;
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return nil;
}
@ -125,7 +127,7 @@ NSAllMapTableValues(NSMapTable *table)
enumerator = NSEnumerateMapTable(table);
/* Step through TABLE... */
while (NSNextMapEnumeratorPair(&enumerator, 0, (void **)(&value)))
while (NSNextMapEnumeratorPair(&enumerator, &dummy, (void **)(&value)))
{
[valueArray addObject: value];
}
@ -152,12 +154,12 @@ NSCompareMapTables(NSMapTable *table1, NSMapTable *table2)
}
if (t1 == 0)
{
NSWarnLog(@"Nul first argument supplied");
NSWarnFLog(@"Nul first argument supplied");
return NO;
}
if (t2 == 0)
{
NSWarnLog(@"Nul second argument supplied");
NSWarnFLog(@"Nul second argument supplied");
return NO;
}
@ -192,7 +194,7 @@ NSCopyMapTableWithZone(NSMapTable *table, NSZone *zone)
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return 0;
}
@ -218,7 +220,7 @@ NSCountMapTable(NSMapTable *table)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return 0;
}
return ((GSIMapTable)table)->nodeCount;
@ -289,7 +291,7 @@ NSEndMapTableEnumeration(NSMapEnumerator *enumerator)
{
if (enumerator == 0)
{
NSWarnLog(@"Nul enumerator argument supplied");
NSWarnFLog(@"Nul enumerator argument supplied");
}
}
@ -304,7 +306,7 @@ NSEnumerateMapTable(NSMapTable *table)
{
NSMapEnumerator v = {0, 0};
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return v;
}
return GSIMapEnumeratorForMap((GSIMapTable)table);
@ -318,7 +320,7 @@ NSFreeMapTable(NSMapTable *table)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
}
else
{
@ -340,7 +342,7 @@ NSMapGet(NSMapTable *table, const void *key)
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return 0;
}
n = GSIMapNodeForKey((GSIMapTable)table, (GSIMapKey)key);
@ -462,7 +464,7 @@ NSMapMember(NSMapTable *table, const void *key,
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return NO;
}
n = GSIMapNodeForKey((GSIMapTable)table, (GSIMapKey)key);
@ -492,7 +494,7 @@ NSMapRemove(NSMapTable *table, const void *key)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return;
}
GSIMapRemoveKey((GSIMapTable)table, (GSIMapKey)key);
@ -513,7 +515,7 @@ NSNextMapEnumeratorPair(NSMapEnumerator *enumerator,
if (enumerator == 0)
{
NSWarnLog(@"Nul enumerator argument supplied");
NSWarnFLog(@"Nul enumerator argument supplied");
return NO;
}
n = GSIMapEnumeratorNextNode((GSIMapEnumerator)enumerator);
@ -527,10 +529,19 @@ NSNextMapEnumeratorPair(NSMapEnumerator *enumerator,
{
*key = n->key.ptr;
}
else
{
NSWarnFLog(@"Nul key return address");
}
if (value != 0)
{
*value = n->value.ptr;
}
else
{
NSWarnFLog(@"Nul value return address");
}
return YES;
}
}
@ -543,7 +554,7 @@ NSResetMapTable(NSMapTable *table)
{
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
}
else
{
@ -568,7 +579,7 @@ NSStringFromMapTable(NSMapTable *table)
if (table == 0)
{
NSWarnLog(@"Nul table argument supplied");
NSWarnFLog(@"Nul table argument supplied");
return nil;
}
string = [NSMutableString stringWithCapacity: 0];

1
Source/NSRunLoop.m
View file

@ -40,7 +40,6 @@
#include <Foundation/NSRunLoop.h>
#include <Foundation/NSThread.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSDebug.h>
#if HAVE_SYS_TYPES_H
#include <sys/types.h>