From 3d7bb17748206dd91d89147cdfb032336a1a2676 Mon Sep 17 00:00:00 2001 From: mccallum Date: Mon, 27 May 1996 15:02:32 +0000 Subject: [PATCH] (NSStringFromMapTable): Instead of @%, use %s and [s cStringNoCopy]. (NSMapInsertKnownAbsent): Likewise. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@1556 72102866-910b-0410-8b05-ffd578937521 --- Source/NSMapTable.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/NSMapTable.m b/Source/NSMapTable.m index 17b9ba9f0..b7427ab19 100644 --- a/Source/NSMapTable.m +++ b/Source/NSMapTable.m @@ -522,9 +522,9 @@ NSMapInsertKnownAbsent(NSMapTable *table, const void *key, const void *value) * information. Not difficult to do, just something for a later * date. */ [NSException raise:NSInvalidArgumentException - format:@"NSMapTable: illegal reinsertion of: %@ -> %@", - NSMT_DESCRIBE_KEY(table, key), - NSMT_DESCRIBE_VALUE(table, value)]; + format:@"NSMapTable: illegal reinsertion of: %s -> %s", + [NSMT_DESCRIBE_KEY(table, key) cStringNoCopy], + [NSMT_DESCRIBE_VALUE(table, value) cStringNoCopy]]; } else { @@ -569,8 +569,9 @@ NSStringFromMapTable(NSMapTable *table) /* Now, just step through the elements of the table, and add their * descriptions to the string. */ while (NSNextMapEnumeratorPair(&enumerator, &key, &value)) - [string appendFormat:@"%@ = %@;", (keyCallBacks.describe)(table, key), - (valueCallBacks.describe)(table, value)]; + [string appendFormat:@"%@ = %@;", + [(keyCallBacks.describe)(table, key) cStringNoCopy], + [(valueCallBacks.describe)(table, value) cStringNoCopy]]; /* Note that this string'll need to be `retain'ed. */ return string;