From c21ef3f26595cfd3cc8f556442adf1c56f01a1fd Mon Sep 17 00:00:00 2001 From: Richard Frith-Macdonald Date: Wed, 13 Feb 2002 22:25:38 +0000 Subject: [PATCH] Fix some argument names for autogsdoc git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12538 72102866-910b-0410-8b05-ffd578937521 --- Headers/gnustep/base/NSMapTable.h | 2 +- Source/NSDebug.m | 4 +-- Source/NSDecimal.m | 43 ++++++++++++++++--------------- Source/NSMapTable.m | 2 +- Source/NSObjCRuntime.m | 8 +++--- Source/NSProcessInfo.m | 19 ++++++++------ Source/NSRange.m | 4 +-- 7 files changed, 43 insertions(+), 39 deletions(-) diff --git a/Headers/gnustep/base/NSMapTable.h b/Headers/gnustep/base/NSMapTable.h index c6da87dea..834d63224 100644 --- a/Headers/gnustep/base/NSMapTable.h +++ b/Headers/gnustep/base/NSMapTable.h @@ -137,7 +137,7 @@ NSCreateMapTable(NSMapTableKeyCallBacks keyCallBacks, * default zone.) */ GS_EXPORT NSMapTable * NSCreateMapTableWithZone(NSMapTableKeyCallBacks keyCallBacks, - NSMapTableValueCallBacks valueCallbacks, + NSMapTableValueCallBacks valueCallBacks, unsigned int capacity, NSZone *zone); diff --git a/Source/NSDebug.m b/Source/NSDebug.m index 3fee9667f..8ed3a2470 100644 --- a/Source/NSDebug.m +++ b/Source/NSDebug.m @@ -328,7 +328,7 @@ GSDebugAllocationClassList() * call (difference != 0). */ const char* -GSDebugAllocationList(BOOL difference) +GSDebugAllocationList(BOOL changeFlag) { const char *ans; if (debug_allocation == NO) @@ -337,7 +337,7 @@ GSDebugAllocationList(BOOL difference) } if (uniqueLock != nil) [uniqueLock lock]; - ans = _GSDebugAllocationList(difference); + ans = _GSDebugAllocationList(changeFlag); if (uniqueLock != nil) [uniqueLock unlock]; return ans; diff --git a/Source/NSDecimal.m b/Source/NSDecimal.m index d50470089..a3fac9857 100644 --- a/Source/NSDecimal.m +++ b/Source/NSDecimal.m @@ -585,24 +585,24 @@ GSSimpleMultiply(NSDecimal *result, NSDecimal *l, NSDecimal *r, NSRoundingMode mode); NSCalculationError -NSDecimalMultiply(NSDecimal *result, const NSDecimal *left, const NSDecimal *right, +NSDecimalMultiply(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, NSRoundingMode mode) { NSCalculationError error = NSCalculationNoError; NSDecimal n1; NSDecimal n2; - int exp = left->exponent + right->exponent; - BOOL neg = left->isNegative != right->isNegative; + int exp = l->exponent + r->exponent; + BOOL neg = l->isNegative != r->isNegative; NSComparisonResult comp; - if (!left->validNumber || !right->validNumber) + if (!l->validNumber || !r->validNumber) { result->validNumber = NO; return error; } // check for zero - if (NSDECIMAL_IS_ZERO(left) || NSDECIMAL_IS_ZERO(right)) + if (NSDECIMAL_IS_ZERO(l) || NSDECIMAL_IS_ZERO(r)) { NSDecimalCopy(result, &zero); return error; @@ -617,8 +617,8 @@ NSDecimalMultiply(NSDecimal *result, const NSDecimal *left, const NSDecimal *rig return NSCalculationOverflow; } - NSDecimalCopy(&n1, left); - NSDecimalCopy(&n2, right); + NSDecimalCopy(&n1, l); + NSDecimalCopy(&n2, r); n1.exponent = 0; n2.exponent = 0; n1.isNegative = NO; @@ -664,25 +664,26 @@ NSDecimalMultiply(NSDecimal *result, const NSDecimal *left, const NSDecimal *rig NSCalculationError GSSimpleDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, - NSRoundingMode mode); + NSRoundingMode mode); NSCalculationError -NSDecimalDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, NSRoundingMode mode) +NSDecimalDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *rr, + NSRoundingMode mode) { NSCalculationError error = NSCalculationNoError; NSDecimal n1; NSDecimal n2; - int exp = l->exponent - r->exponent; - BOOL neg = l->isNegative != r->isNegative; + int exp = l->exponent - rr->exponent; + BOOL neg = l->isNegative != rr->isNegative; - if (!l->validNumber || !r->validNumber) + if (!l->validNumber || !rr->validNumber) { result->validNumber = NO; return NSCalculationNoError; } // Check for zero - if (NSDECIMAL_IS_ZERO(r)) + if (NSDECIMAL_IS_ZERO(rr)) { result->validNumber = NO; return NSCalculationDivideByZero; @@ -698,7 +699,7 @@ NSDecimalDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, NSRou NSDecimalCopy(&n1, l); n1.exponent = 0; n1.isNegative = NO; - NSDecimalCopy(&n2, r); + NSDecimalCopy(&n2, rr); n2.exponent = 0; n2.isNegative = NO; @@ -733,14 +734,14 @@ NSDecimalDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, NSRou } NSCalculationError -NSDecimalPower(NSDecimal *result, const NSDecimal *l, unsigned power, NSRoundingMode mode) +NSDecimalPower(NSDecimal *result, const NSDecimal *n, unsigned power, NSRoundingMode mode) { NSCalculationError error = NSCalculationNoError; unsigned int e = power; NSDecimal n1; - BOOL neg = (l->isNegative && (power % 2)); + BOOL neg = (n->isNegative && (power % 2)); - NSDecimalCopy(&n1, l); + NSDecimalCopy(&n1, n); n1.isNegative = NO; NSDecimalCopy(result, &one); // NSDecimalCopy(result, &zero); @@ -1242,11 +1243,11 @@ GSSimpleDivide(NSDecimal *result, const NSDecimal *left, const NSDecimal *right, } NSString* -NSDecimalString(const NSDecimal *number, NSDictionary *locale) +NSDecimalString(const NSDecimal *decimal, NSDictionary *locale) { GSDecimal n; - DecimalToCharvec(number, &n); + DecimalToCharvec(decimal, &n); return GSDecimalString(&n, locale); } @@ -1599,9 +1600,9 @@ GSSimpleDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, } NSString* -NSDecimalString(const NSDecimal *number, NSDictionary *locale) +NSDecimalString(const NSDecimal *decimal, NSDictionary *locale) { - return GSDecimalString(number, locale); + return GSDecimalString(decimal, locale); } // GNUstep extensions to make the implementation of NSDecimalNumber totaly diff --git a/Source/NSMapTable.m b/Source/NSMapTable.m index 66521335c..bfc406174 100644 --- a/Source/NSMapTable.m +++ b/Source/NSMapTable.m @@ -251,7 +251,7 @@ NSMapTable * NSCreateMapTableWithZone( NSMapTableKeyCallBacks keyCallBacks, NSMapTableValueCallBacks valueCallBacks, - unsigned capacity, + unsigned int capacity, NSZone *zone) { GSIMapTable table; diff --git a/Source/NSObjCRuntime.m b/Source/NSObjCRuntime.m index c753d4d02..697f40592 100644 --- a/Source/NSObjCRuntime.m +++ b/Source/NSObjCRuntime.m @@ -119,13 +119,13 @@ GSInstanceVariableInfo(id obj, NSString *iVarName, } BOOL -GSGetInstanceVariable(id obj, NSString *iVarName, void *data) +GSGetInstanceVariable(id obj, NSString *name, void *data) { int offset; const char *type; unsigned int size; - if (GSInstanceVariableInfo(obj, iVarName, &type, &size, &offset) == NO) + if (GSInstanceVariableInfo(obj, name, &type, &size, &offset) == NO) { return NO; } @@ -136,13 +136,13 @@ GSGetInstanceVariable(id obj, NSString *iVarName, void *data) } BOOL -GSSetInstanceVariable(id obj, NSString *iVarName, const void *data) +GSSetInstanceVariable(id obj, NSString *name, const void *data) { int offset; const char *type; unsigned int size; - if (GSInstanceVariableInfo(obj, iVarName, &type, &size, &offset) == NO) + if (GSInstanceVariableInfo(obj, name, &type, &size, &offset) == NO) { return NO; } diff --git a/Source/NSProcessInfo.m b/Source/NSProcessInfo.m index bf901d107..8e1a9733a 100644 --- a/Source/NSProcessInfo.m +++ b/Source/NSProcessInfo.m @@ -627,9 +627,9 @@ int main(int argc, char *argv[], char *env[]) [self hostName], pid, [NSDate date]]; } -/************************************************************************* - *** Specifying a Process Name - *************************************************************************/ +/** + * Change the name of the current process to newName. + */ - (void) setProcessName: (NSString *)newName { if (newName && [newName length]) { @@ -641,10 +641,11 @@ int main(int argc, char *argv[], char *env[]) @end -/* - * Function for rapid testing to see if a debug level is set. +/** + * Function for rapid testing to see if a debug level is set. + * This is used by the debugging macros. */ -BOOL GSDebugSet(NSString *val) +BOOL GSDebugSet(NSString *level) { static IMP debugImp = 0; static SEL debugSel; @@ -658,8 +659,10 @@ BOOL GSDebugSet(NSString *val) } debugImp = [_debug_set methodForSelector: debugSel]; } - if ((*debugImp)(_debug_set, debugSel, val) == nil) - return NO; + if ((*debugImp)(_debug_set, debugSel, level) == nil) + { + return NO; + } return YES; } diff --git a/Source/NSRange.m b/Source/NSRange.m index 52e906230..f52e80779 100644 --- a/Source/NSRange.m +++ b/Source/NSRange.m @@ -63,13 +63,13 @@ setupCache() } NSRange -NSRangeFromString(NSString* string) +NSRangeFromString(NSString *aString) { NSScanner *scanner; NSRange range; setupCache(); - scanner = (*scannerImp)(NSScannerClass, scannerSel, string); + scanner = (*scannerImp)(NSScannerClass, scannerSel, aString); if ((*scanStringImp)(scanner, scanStringSel, @"{", NULL) && (*scanStringImp)(scanner, scanStringSel, @"location", NULL) && (*scanStringImp)(scanner, scanStringSel, @"=", NULL)