diff --git a/ChangeLog.2 b/ChangeLog.2 index efcfdc40c..ee9da72f1 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -6301,7 +6301,7 @@ Wed Jun 5 17:46:47 2002 Nicola Pero * Source/Unicode.m: GSFromUnicode(), GSToUnicode(), bugfix - ensure that returned memory is allocated from specified zone, rather than returning internal buffer. - * Tools/AGSIndex.m: When a string missmatch is found when merging, + * Tools/AGSIndex.m: When a string mismatch is found when merging, update the output to the new string as well as warning. * Tools/autogsdoc.m: Don't automatically include refs to installed copies of the project being documented. diff --git a/Documentation/news.texi b/Documentation/news.texi index 34a3c2464..585affd96 100644 --- a/Documentation/news.texi +++ b/Documentation/news.texi @@ -1106,7 +1106,7 @@ NeXT-compatible zone functions. @end itemize -@section Noteworthy changes in verion @samp{940524} +@section Noteworthy changes in version @samp{940524} @itemize @bullet diff --git a/Headers/Foundation/NSAutoreleasePool.h b/Headers/Foundation/NSAutoreleasePool.h index 4c78b70fa..ce5010724 100644 --- a/Headers/Foundation/NSAutoreleasePool.h +++ b/Headers/Foundation/NSAutoreleasePool.h @@ -307,7 +307,7 @@ NS_AUTOMATED_REFCOUNT_UNAVAILABLE * Default value is maxint. *

*/ -+ (void) setPoolCountThreshhold: (unsigned)c; ++ (void) setPoolCountThreshold: (unsigned)c; /** * Return the number of objects in this pool. diff --git a/NEWS b/NEWS index a3bb598b6..f1d0873bd 100644 --- a/NEWS +++ b/NEWS @@ -994,8 +994,8 @@ made on GNUSTEP. in List and HashTable. New files zone.[hc] containing dummy stubs for NeXT-compatible zone functions. -1.77 Noteworthy changes in verion '940524' -========================================== +1.77 Noteworthy changes in version '940524' +=========================================== * A NeXT-compatible NXStringTable object, thanks to Adam Fedor . diff --git a/Source/GSSocksParser/GSSocksParser.m b/Source/GSSocksParser/GSSocksParser.m index 4f08cea4c..0d1f057e5 100644 --- a/Source/GSSocksParser/GSSocksParser.m +++ b/Source/GSSocksParser/GSSocksParser.m @@ -71,7 +71,7 @@ else { [NSException raise: NSInternalInconsistencyException - format: @"Unsupported socks verion: %@", version]; + format: @"Unsupported socks version: %@", version]; return nil; // Avoid spurious compiler warning } return [[concreteClass alloc] initWithConfiguration: aConfiguration diff --git a/Source/NSAutoreleasePool.m b/Source/NSAutoreleasePool.m index 0d672395f..ba32d4b97 100644 --- a/Source/NSAutoreleasePool.m +++ b/Source/NSAutoreleasePool.m @@ -51,12 +51,12 @@ static BOOL autorelease_enabled = YES; /* When the _released_count of a pool gets over this value, we raise - an exception. This can be adjusted with +setPoolCountThreshhold */ -static unsigned pool_count_warning_threshhold = UINT_MAX-1; + an exception. This can be adjusted with +setPoolCountThreshold */ +static unsigned pool_count_warning_threshold = UINT_MAX-1; /* When the number of pools in a thread gets over this value, we raise - an exception. This can be adjusted with +setPoolNumberThreshhold */ -static unsigned pool_number_warning_threshhold = 10000; + an exception. This can be adjusted with +setPoolNumberThreshold */ +static unsigned pool_number_warning_threshold = 10000; /* The size of the first _released array. */ #define BEGINNING_POOL_SIZE 32 @@ -198,7 +198,7 @@ pop_pool_from_cache (struct autorelease_thread_vars *tv) _parent->_child = self; } tv->current_pool = self; - if (level > pool_number_warning_threshhold) + if (level > pool_number_warning_threshold) { [NSException raise: NSGenericException format: @"Too many (%u) autorelease pools ... leaking them?", level]; @@ -297,7 +297,7 @@ pop_pool_from_cache (struct autorelease_thread_vars *tv) _parent->_child = self; } tv->current_pool = self; - if (level > pool_number_warning_threshhold) + if (level > pool_number_warning_threshold) { [NSException raise: NSGenericException format: @"Too many (%u) autorelease pools ... leaking them?", level]; @@ -389,10 +389,10 @@ pop_pool_from_cache (struct autorelease_thread_vars *tv) if (!autorelease_enabled) return; - if (_released_count >= pool_count_warning_threshhold) + if (_released_count >= pool_count_warning_threshold) { [NSException raise: NSGenericException - format: @"AutoreleasePool count threshhold exceeded."]; + format: @"AutoreleasePool count threshold exceeded."]; } /* Get a new array for the list, if the current one is full. */ @@ -662,15 +662,15 @@ pop_pool_from_cache (struct autorelease_thread_vars *tv) free_pool_cache(ARP_THREAD_VARS); } -+ (void) setPoolCountThreshhold: (unsigned)c ++ (void) setPoolCountThreshold: (unsigned)c { if (c >= UINT_MAX) c = UINT_MAX - 1; - pool_count_warning_threshhold = c; + pool_count_warning_threshold = c; } -+ (void) setPoolNumberThreshhold: (unsigned)c ++ (void) setPoolNumberThreshold: (unsigned)c { - pool_number_warning_threshhold = c; + pool_number_warning_threshold = c; } @end diff --git a/Source/NSConnection.m b/Source/NSConnection.m index 372b61f3b..b06387f81 100644 --- a/Source/NSConnection.m +++ b/Source/NSConnection.m @@ -2578,7 +2578,7 @@ static NSLock *cached_proxies_gate = nil; if (GSSelectorTypesMatch(encoded_types, type) == NO) { [NSException raise: NSInvalidArgumentException - format: @"NSConection types (%s / %s) missmatch for %s", + format: @"NSConection types (%s / %s) mismatch for %s", encoded_types, type, sel_getName(selector)]; } diff --git a/Source/NSKeyedUnarchiver.m b/Source/NSKeyedUnarchiver.m index b0fa61225..9695b329d 100644 --- a/Source/NSKeyedUnarchiver.m +++ b/Source/NSKeyedUnarchiver.m @@ -414,13 +414,13 @@ static NSMapTable *globalClassMap = 0; if (strcmp([o type], type) != 0) { [NSException raise: NSInvalidUnarchiveOperationException - format: @"[%@ +%@]: type missmatch for %@", + format: @"[%@ +%@]: type mismatch for %@", NSStringFromClass([self class]), NSStringFromSelector(_cmd), o]; } if ([o count] != expected) { [NSException raise: NSInvalidUnarchiveOperationException - format: @"[%@ +%@]: count missmatch for %@", + format: @"[%@ +%@]: count mismatch for %@", NSStringFromClass([self class]), NSStringFromSelector(_cmd), o]; } NSGetSizeAndAlignment(type, 0, &size); diff --git a/Tools/AGSParser.m b/Tools/AGSParser.m index d62e883b4..00dcfa480 100644 --- a/Tools/AGSParser.m +++ b/Tools/AGSParser.m @@ -2106,7 +2106,7 @@ fail: if ([a1 isEqual: a2] == NO) { - [self log: @"Function %@ args missmatch - " + [self log: @"Function %@ args mismatch - " @"%@ %@", name, a1, a2]; } /*