From 1ede313efa8bac87890da14c88e386a0da05056c Mon Sep 17 00:00:00 2001 From: CaS Date: Tue, 20 Aug 2002 15:07:58 +0000 Subject: [PATCH] Fix typos etc git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@14301 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 22 ++++++++++++++++++++++ Source/GSCountedSet.m | 2 +- Source/GSFileHandle.m | 2 +- Source/NSArchiver.m | 8 ++++---- Source/NSData.m | 8 ++++---- Source/NSDistributedNotificationCenter.m | 2 +- Source/NSHashTable.m | 18 +++++++++--------- Source/NSMapTable.m | 12 ++++++------ Source/NSObjCRuntime.m | 6 +++--- Source/NSObject.m | 10 +++++----- Source/NSPortCoder.m | 8 ++++---- Source/NSScanner.m | 2 +- Source/NSString.m | 4 ++-- Source/Unicode.m | 14 +++++++------- Source/UnixFileHandle.m | 2 +- Source/WindowsFileHandle.m | 2 +- Source/callframe.m | 2 +- Source/cifframe.m | 2 +- Source/mframe.m | 2 +- 19 files changed, 75 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79e211adc..a7e1eb9cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2002-08-20 Richard Frith-Macdonald + + * Source/GSCountedSet.m: + * Source/GSFileHandle.m: + * Source/NSArchiver.m: + * Source/NSData.m: + * Source/NSDistributedNotificationCenter.m: + * Source/NSHashTable.m: + * Source/NSMapTable.m: + * Source/NSObjCRuntime.m: + * Source/NSObject.m: + * Source/NSPortCoder.m: + * Source/NSScanner.m: + * Source/NSString.m: + * Source/Unicode.m: + * Source/UnixFileHandle.m: + * Source/WindowsFileHandle.m: + * Source/callframe.m: + * Source/cifframe.m: + * Source/mframe.m: + Fix trivial typos and spelling errors pointed out by David Ayers. + 2002-08-20 Richard Frith-Macdonald * Source/GSCountedSet.m: diff --git a/Source/GSCountedSet.m b/Source/GSCountedSet.m index 8c21562bc..790825bb1 100644 --- a/Source/GSCountedSet.m +++ b/Source/GSCountedSet.m @@ -293,7 +293,7 @@ /** * Decrements the count of the number of times that the specified - * object (or an object qequal to it as determined by the + * object (or an object equal to it as determined by the * [-isEqual:] method) has been added to the set. If the count * becomes zero, the object is removed from the set. */ diff --git a/Source/GSFileHandle.m b/Source/GSFileHandle.m index 69f07cf9d..1e6c2203d 100644 --- a/Source/GSFileHandle.m +++ b/Source/GSFileHandle.m @@ -124,7 +124,7 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin) /* * If we were given a hostname, we use any address for that host. * Otherwise we expect the given name to be an address unless it is - * a nul (any address). + * a null (any address). */ if (name) { diff --git a/Source/NSArchiver.m b/Source/NSArchiver.m index c118a7abf..b13ad14a6 100644 --- a/Source/NSArchiver.m +++ b/Source/NSArchiver.m @@ -330,7 +330,7 @@ static Class NSMutableDataMallocClass; if (_initialPass == NO) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_tagImp)(_dst, tagSel, _GSC_PTR | _GSC_XREF | _GSC_X_0); } @@ -399,7 +399,7 @@ static Class NSMutableDataMallocClass; if (*(Class*)buf == 0) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_tagImp)(_dst, tagSel, _GSC_CLASS | _GSC_XREF | _GSC_X_0); } @@ -467,7 +467,7 @@ static Class NSMutableDataMallocClass; if (*(SEL*)buf == 0) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_tagImp)(_dst, tagSel, _GSC_SEL | _GSC_XREF | _GSC_X_0); } @@ -498,7 +498,7 @@ static Class NSMutableDataMallocClass; if (*(char**)buf == 0) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_tagImp)(_dst, tagSel, _GSC_CHARPTR | _GSC_XREF | _GSC_X_0); } diff --git a/Source/NSData.m b/Source/NSData.m index 290e069d4..86521faeb 100644 --- a/Source/NSData.m +++ b/Source/NSData.m @@ -2095,11 +2095,11 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) { if (data == 0) { - NSLog(@"attempt to deserialize to a nul pointer"); + NSLog(@"attempt to deserialize to a null pointer"); } if (type == 0) { - NSLog(@"attempt to deserialize with a nul type encoding"); + NSLog(@"attempt to deserialize with a null type encoding"); } return; } @@ -2853,11 +2853,11 @@ getBytes(void* dst, void* src, unsigned len, unsigned limit, unsigned *pos) { if (data == 0) { - NSLog(@"attempt to serialize from a nul pointer"); + NSLog(@"attempt to serialize from a null pointer"); } if (type == 0) { - NSLog(@"attempt to serialize with a nul type encoding"); + NSLog(@"attempt to serialize with a null type encoding"); } return; } diff --git a/Source/NSDistributedNotificationCenter.m b/Source/NSDistributedNotificationCenter.m index 403290693..a5f9a5c52 100644 --- a/Source/NSDistributedNotificationCenter.m +++ b/Source/NSDistributedNotificationCenter.m @@ -139,7 +139,7 @@ static NSDistributedNotificationCenter *defCenter = nil; if (aSelector == 0) { [NSException raise: NSInvalidArgumentException - format: @"nul selector"]; + format: @"null selector"]; } if (notificationName != nil && [notificationName isKindOfClass: [NSString class]] == NO) diff --git a/Source/NSHashTable.m b/Source/NSHashTable.m index b315d0203..26389ab2c 100644 --- a/Source/NSHashTable.m +++ b/Source/NSHashTable.m @@ -280,7 +280,7 @@ NSFreeHashTable(NSHashTable *table) } /** - * Returns the value for the specified element, or a nul pointer if the + * Returns the value for the specified element, or a null pointer if the * element is not found in the table. */ void * @@ -307,7 +307,7 @@ NSHashGet(NSHashTable *table, const void *element) /** * Adds the element to table.
* If an equal element is already in table, replaces it with the new one.
- * If element is nul raises an NSInvalidArgumentException. + * If element is null raises an NSInvalidArgumentException. */ void NSHashInsert(NSHashTable *table, const void *element) @@ -318,12 +318,12 @@ NSHashInsert(NSHashTable *table, const void *element) if (table == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place value in nul hash table"]; + format: @"Attempt to place value in null hash table"]; } if (element == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place nul in hash table"]; + format: @"Attempt to place null in hash table"]; } n = GSIMapNodeForKey(t, (GSIMapKey)element); if (n == 0) @@ -355,12 +355,12 @@ NSHashInsertIfAbsent(NSHashTable *table, const void *element) if (table == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place value in nul hash table"]; + format: @"Attempt to place value in null hash table"]; } if (element == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place nul in hash table"]; + format: @"Attempt to place null in hash table"]; } n = GSIMapNodeForKey(t, (GSIMapKey)element); if (n == 0) @@ -377,7 +377,7 @@ NSHashInsertIfAbsent(NSHashTable *table, const void *element) /** * Adds the element to table and returns nul.
* If an equal element is already present, raises NSInvalidArgumentException. - *
If element is nul raises an NSInvalidArgumentException. + *
If element is null raises an NSInvalidArgumentException. */ void NSHashInsertKnownAbsent(NSHashTable *table, const void *element) @@ -388,12 +388,12 @@ NSHashInsertKnownAbsent(NSHashTable *table, const void *element) if (table == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place value in nul hash table"]; + format: @"Attempt to place value in null hash table"]; } if (element == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place nul in hash table"]; + format: @"Attempt to place null in hash table"]; } n = GSIMapNodeForKey(t, (GSIMapKey)element); if (n == 0) diff --git a/Source/NSMapTable.m b/Source/NSMapTable.m index ccf9d3b69..477d26c2f 100644 --- a/Source/NSMapTable.m +++ b/Source/NSMapTable.m @@ -339,7 +339,7 @@ NSFreeMapTable(NSMapTable *table) } /** - * Returns the value for the specified key, or a nul pointer if the + * Returns the value for the specified key, or a null pointer if the * key is not found in the table. */ void * @@ -379,7 +379,7 @@ NSMapInsert(NSMapTable *table, const void *key, const void *value) if (table == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place key-value in nul table"]; + format: @"Attempt to place key-value in null table"]; } if (key == t->extra.k.notAKeyMarker) { @@ -417,7 +417,7 @@ NSMapInsertIfAbsent(NSMapTable *table, const void *key, const void *value) if (table == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place key-value in nul table"]; + format: @"Attempt to place key-value in null table"]; } if (key == t->extra.k.notAKeyMarker) { @@ -451,7 +451,7 @@ NSMapInsertKnownAbsent(NSMapTable *table, const void *key, const void *value) if (table == 0) { [NSException raise: NSInvalidArgumentException - format: @"Attempt to place key-value in nul table"]; + format: @"Attempt to place key-value in null table"]; } if (key == t->extra.k.notAKeyMarker) { @@ -474,7 +474,7 @@ NSMapInsertKnownAbsent(NSMapTable *table, const void *key, const void *value) * Returns a flag to say whether the table contains the specified key. * Returns the original key and the value it maps to.
* The GNUstep implementation checks originalKey and value to see if - * they are nul pointers, and only updates them if non-null. + * they are null pointers, and only updates them if non-null. */ BOOL NSMapMember(NSMapTable *table, const void *key, @@ -524,7 +524,7 @@ NSMapRemove(NSMapTable *table, const void *key) * Step through the map table ... return the next key-value pair and * return YES, or hit the end of the table and return NO.
* The GNUstep implementation permits either key or value to be a - * nul pointer, and refrains from attempting to return the appropriate + * null pointer, and refrains from attempting to return the appropriate * result in that case. */ BOOL diff --git a/Source/NSObjCRuntime.m b/Source/NSObjCRuntime.m index c6b50f438..d6971df37 100644 --- a/Source/NSObjCRuntime.m +++ b/Source/NSObjCRuntime.m @@ -81,7 +81,7 @@ NSGetSizeAndAlignment(const char *typePtr, unsigned *sizep, unsigned *alignp) * variable of obj called name. It returns YES if the variable * was found, NO otherwise. If it returns YES, then the values * pointed to by type, size, and offset will be set (except where - * they are nul pointers). + * they are null pointers). */ BOOL GSFindInstanceVariable(id obj, const char *name, @@ -199,7 +199,7 @@ GSSetInstanceVariable(id obj, NSString *iVarName, const void *data) * supplied), or via direct access (if type, size, and offset are * supplied).
* Automatic conversion between NSNumber and C scalar types is performed.
- * If type is nul and can't be determined from the selector, the + * If type is null and can't be determined from the selector, the * [NSObject-handleQueryWithUnboundKey:] method is called to try * to get a value. */ @@ -509,7 +509,7 @@ GSGetValue(NSObject *self, NSString *key, SEL sel, * supplied), or via direct access (if type, size, and offset are * supplied).
* Automatic conversion between NSNumber and C scalar types is performed.
- * If type is nul and can't be determined from the selector, the + * If type is null and can't be determined from the selector, the * [NSObject-handleTakevalue:forUnboundKey:] method is called to try * to set a value. */ diff --git a/Source/NSObject.m b/Source/NSObject.m index 0c948a99f..7ea57b563 100644 --- a/Source/NSObject.m +++ b/Source/NSObject.m @@ -1,4 +1,4 @@ -/** Implementation of NSObject for GNUStep +null Implementation of NSObject for GNUStep Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. Written by: Andrew Kachites McCallum @@ -913,7 +913,7 @@ static BOOL double_release_check_enabled = NO; * *

*

- * You do no normally need to override new in + * You do not normally need to override new in * subclasses, because if you override init (and * optionally allocWithZone: if you really * need), new will automatically use your @@ -1502,7 +1502,7 @@ static BOOL double_release_check_enabled = NO; if (aSelector == 0) { [NSException raise: NSInvalidArgumentException - format: @"nul selector passed to %s", sel_get_name(_cmd)]; + format: @"null selector passed to %s", sel_get_name(_cmd)]; return nil; } @@ -1528,7 +1528,7 @@ static BOOL double_release_check_enabled = NO; if (aSelector == 0) { [NSException raise: NSInvalidArgumentException - format: @"nul selector passed to %s", sel_get_name(_cmd)]; + format: @"null selector passed to %s", sel_get_name(_cmd)]; return nil; } @@ -1557,7 +1557,7 @@ static BOOL double_release_check_enabled = NO; if (aSelector == 0) { [NSException raise: NSInvalidArgumentException - format: @"nul selector passed to %s", sel_get_name(_cmd)]; + format: @"null selector passed to %s", sel_get_name(_cmd)]; return nil; } diff --git a/Source/NSPortCoder.m b/Source/NSPortCoder.m index 689b3ce65..00c258aeb 100644 --- a/Source/NSPortCoder.m +++ b/Source/NSPortCoder.m @@ -1382,7 +1382,7 @@ static IMP _xRefImp; /* Serialize a crossref. */ if (_initialPass == NO) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_eTagImp)(_dst, eTagSel, _GSC_PTR | _GSC_XREF | _GSC_X_0); } @@ -1451,7 +1451,7 @@ static IMP _xRefImp; /* Serialize a crossref. */ if (*(Class*)buf == 0) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_eTagImp)(_dst, eTagSel, _GSC_CLASS | _GSC_XREF | _GSC_X_0); } @@ -1519,7 +1519,7 @@ static IMP _xRefImp; /* Serialize a crossref. */ if (*(SEL*)buf == 0) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_eTagImp)(_dst, eTagSel, _GSC_SEL | _GSC_XREF | _GSC_X_0); } @@ -1550,7 +1550,7 @@ static IMP _xRefImp; /* Serialize a crossref. */ if (*(char**)buf == 0) { /* - * Special case - a nul pointer gets an xref of zero + * Special case - a null pointer gets an xref of zero */ (*_eTagImp)(_dst, eTagSel, _GSC_CHARPTR | _GSC_XREF | _GSC_X_0); } diff --git a/Source/NSScanner.m b/Source/NSScanner.m index d5d9b8ec9..5e99a1522 100644 --- a/Source/NSScanner.m +++ b/Source/NSScanner.m @@ -1003,7 +1003,7 @@ typedef struct { /** * Sets the case sensitivity of the scanner. *
- * Case sensitivity governs matrching of characters being scanned, + * Case sensitivity governs matching of characters being scanned, * but does not effect the characters in the set to be skipped. *
* The default is for a scanner to not be case sensitive. diff --git a/Source/NSString.m b/Source/NSString.m index 64dd83425..00de2a15c 100644 --- a/Source/NSString.m +++ b/Source/NSString.m @@ -588,7 +588,7 @@ handle_printf_atsign (FILE *stream, if (chars == 0) { [NSException raise: NSInvalidArgumentException - format: @"nul pointer but non-zero length"]; + format: @"null pointer but non-zero length"]; } for (i = 0; i < length; i++) { @@ -2139,7 +2139,7 @@ handle_printf_atsign (FILE *stream, // Getting C Strings /** - * Returns a pointer to a nul terminated string of 8-bit + * Returns a pointer to a null terminated string of 8-bit * characters in the default encoding. The memory pointed * to is not owned by the caller, so the caller must copy * its contents to keep it. diff --git a/Source/Unicode.m b/Source/Unicode.m index d4309eb8a..0d466f8bc 100644 --- a/Source/Unicode.m +++ b/Source/Unicode.m @@ -103,7 +103,7 @@ struct _strenc_ { * is the empty string, we cannot use * iconv perform conversions to/from * this encoding. - * NB. do not put a nul pointer in this + * NB. do not put a null pointer in this * field in the table, use "" instread. */ BOOL eightBit; /* Flag to say whether this encoding @@ -660,7 +660,7 @@ else \ /** * Function to convert from 8-bit character data to 16-bit unicode. *

The dst argument is a pointer to a pointer to a buffer in which the - * converted string is to be stored. If it is a nul pointer, this function + * converted string is to be stored. If it is a null pointer, this function * discards converted data, and is used only to determine the length of the * converted string. If the zone argument is non-nul, the function is free * to allocate a larger buffer if necessary, and store this new buffer in @@ -683,12 +683,12 @@ else \ *

The zone argument specifies a memory zone in which the function may * allocate a buffer to return data in. * If this is nul, the function will fail if the originally supplied buffer - * is not big enough (unless dst is a nul pointer ... indicating that + * is not big enough (unless dst is a null pointer ... indicating that * converted data is to be discarded). *

* The options argument controls some special behavior. * - * If GSUniTerminate is set, the function is expected to nul terminate + * If GSUniTerminate is set, the function is expected to null terminate * the output string, and will assume that it is safe to place the nul * just beyond the ned of the stated buffer size. * Also, if the function grows the buffer, it will allow for an extra @@ -1012,7 +1012,7 @@ else \ /** * Function to convert from 16-bit unicode to 8-bit character data. *

The dst argument is a pointer to a pointer to a buffer in which the - * converted string is to be stored. If it is a nul pointer, this function + * converted string is to be stored. If it is a null pointer, this function * discards converted data, and is used only to determine the length of the * converted string. If the zone argument is non-nul, the function is free * to allocate a larger buffer if necessary, and store this new buffer in @@ -1035,7 +1035,7 @@ else \ *

The zone argument specifies a memory zone in which the function may * allocate a buffer to return data in. * If this is nul, the function will fail if the originally supplied buffer - * is not big enough (unless dst is a nul pointer ... indicating that + * is not big enough (unless dst is a null pointer ... indicating that * converted data is to be discarded). *

* The options argument controls some special behavior. @@ -1044,7 +1044,7 @@ else \ * encountered which can't be displayed in the source. Otherwise, some * approximation or marker will be placed in the destination. * - * If GSUniTerminate is set, the function is expected to nul terminate + * If GSUniTerminate is set, the function is expected to null terminate * the output string, and will assume that it is safe to place the nul * just beyond the ned of the stated buffer size. * Also, if the function grows the buffer, it will allow for an extra diff --git a/Source/UnixFileHandle.m b/Source/UnixFileHandle.m index fdf5079fb..b249a9cb9 100644 --- a/Source/UnixFileHandle.m +++ b/Source/UnixFileHandle.m @@ -124,7 +124,7 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin) /* * If we were given a hostname, we use any address for that host. * Otherwise we expect the given name to be an address unless it is - * a nul (any address). + * a null (any address). */ if (name) { diff --git a/Source/WindowsFileHandle.m b/Source/WindowsFileHandle.m index 1cfd5cbed..4a09d142d 100644 --- a/Source/WindowsFileHandle.m +++ b/Source/WindowsFileHandle.m @@ -84,7 +84,7 @@ getAddr(NSString* name, NSString* svc, NSString* pcl, struct sockaddr_in *sin) /* * If we were given a hostname, we use any address for that host. * Otherwise we expect the given name to be an address unless it is - * a nul (any address). + * a null (any address). */ if (name) { diff --git a/Source/callframe.m b/Source/callframe.m index 998a48bde..b6c02afc7 100644 --- a/Source/callframe.m +++ b/Source/callframe.m @@ -560,7 +560,7 @@ callframe_do_call (DOContext *ctxt, sets up the invocation with the return value, and updates the pass-by-reference arguments. - The callback function is finally called with the 'type' set to a nul pointer + The callback function is finally called with the 'type' set to a null pointer to tell it that the return value and all return parameters have been dealt with. This permits the function to do any tidying up necessary. */ diff --git a/Source/cifframe.m b/Source/cifframe.m index 960ca4849..cbe026255 100644 --- a/Source/cifframe.m +++ b/Source/cifframe.m @@ -954,7 +954,7 @@ cifframe_do_call (DOContext *ctxt, sets up the invocation with the return value, and updates the pass-by-reference arguments. - The callback function is finally called with the 'type' set to a nul pointer + The callback function is finally called with the 'type' set to a null pointer to tell it that the return value and all return parameters have been dealt with. This permits the function to do any tidying up necessary. */ diff --git a/Source/mframe.m b/Source/mframe.m index 512a8ffe2..0741cb52e 100644 --- a/Source/mframe.m +++ b/Source/mframe.m @@ -1313,7 +1313,7 @@ static retval_t apply_short(short data) alloca()'ed, not malloc()'ed, and therefore is on the stack and can be tromped-on by future function calls. - The callback function is finally called with the 'type' set to a nul pointer + The callback function is finally called with the 'type' set to a null pointer to tell it that the return value and all return parameters have been dealt with. This permits the function to do any tidying up necessary. */