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
This commit is contained in:
CaS 2002-02-13 22:25:38 +00:00
parent d4759ee45e
commit 9172e99294
7 changed files with 43 additions and 39 deletions

View file

@ -137,7 +137,7 @@ NSCreateMapTable(NSMapTableKeyCallBacks keyCallBacks,
* default zone.) */ * default zone.) */
GS_EXPORT NSMapTable * GS_EXPORT NSMapTable *
NSCreateMapTableWithZone(NSMapTableKeyCallBacks keyCallBacks, NSCreateMapTableWithZone(NSMapTableKeyCallBacks keyCallBacks,
NSMapTableValueCallBacks valueCallbacks, NSMapTableValueCallBacks valueCallBacks,
unsigned int capacity, unsigned int capacity,
NSZone *zone); NSZone *zone);

View file

@ -328,7 +328,7 @@ GSDebugAllocationClassList()
* call (difference != 0). * call (difference != 0).
*/ */
const char* const char*
GSDebugAllocationList(BOOL difference) GSDebugAllocationList(BOOL changeFlag)
{ {
const char *ans; const char *ans;
if (debug_allocation == NO) if (debug_allocation == NO)
@ -337,7 +337,7 @@ GSDebugAllocationList(BOOL difference)
} }
if (uniqueLock != nil) if (uniqueLock != nil)
[uniqueLock lock]; [uniqueLock lock];
ans = _GSDebugAllocationList(difference); ans = _GSDebugAllocationList(changeFlag);
if (uniqueLock != nil) if (uniqueLock != nil)
[uniqueLock unlock]; [uniqueLock unlock];
return ans; return ans;

View file

@ -585,24 +585,24 @@ GSSimpleMultiply(NSDecimal *result, NSDecimal *l, NSDecimal *r,
NSRoundingMode mode); NSRoundingMode mode);
NSCalculationError NSCalculationError
NSDecimalMultiply(NSDecimal *result, const NSDecimal *left, const NSDecimal *right, NSDecimalMultiply(NSDecimal *result, const NSDecimal *l, const NSDecimal *r,
NSRoundingMode mode) NSRoundingMode mode)
{ {
NSCalculationError error = NSCalculationNoError; NSCalculationError error = NSCalculationNoError;
NSDecimal n1; NSDecimal n1;
NSDecimal n2; NSDecimal n2;
int exp = left->exponent + right->exponent; int exp = l->exponent + r->exponent;
BOOL neg = left->isNegative != right->isNegative; BOOL neg = l->isNegative != r->isNegative;
NSComparisonResult comp; NSComparisonResult comp;
if (!left->validNumber || !right->validNumber) if (!l->validNumber || !r->validNumber)
{ {
result->validNumber = NO; result->validNumber = NO;
return error; return error;
} }
// check for zero // check for zero
if (NSDECIMAL_IS_ZERO(left) || NSDECIMAL_IS_ZERO(right)) if (NSDECIMAL_IS_ZERO(l) || NSDECIMAL_IS_ZERO(r))
{ {
NSDecimalCopy(result, &zero); NSDecimalCopy(result, &zero);
return error; return error;
@ -617,8 +617,8 @@ NSDecimalMultiply(NSDecimal *result, const NSDecimal *left, const NSDecimal *rig
return NSCalculationOverflow; return NSCalculationOverflow;
} }
NSDecimalCopy(&n1, left); NSDecimalCopy(&n1, l);
NSDecimalCopy(&n2, right); NSDecimalCopy(&n2, r);
n1.exponent = 0; n1.exponent = 0;
n2.exponent = 0; n2.exponent = 0;
n1.isNegative = NO; n1.isNegative = NO;
@ -664,25 +664,26 @@ NSDecimalMultiply(NSDecimal *result, const NSDecimal *left, const NSDecimal *rig
NSCalculationError NSCalculationError
GSSimpleDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, GSSimpleDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r,
NSRoundingMode mode); NSRoundingMode mode);
NSCalculationError 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; NSCalculationError error = NSCalculationNoError;
NSDecimal n1; NSDecimal n1;
NSDecimal n2; NSDecimal n2;
int exp = l->exponent - r->exponent; int exp = l->exponent - rr->exponent;
BOOL neg = l->isNegative != r->isNegative; BOOL neg = l->isNegative != rr->isNegative;
if (!l->validNumber || !r->validNumber) if (!l->validNumber || !rr->validNumber)
{ {
result->validNumber = NO; result->validNumber = NO;
return NSCalculationNoError; return NSCalculationNoError;
} }
// Check for zero // Check for zero
if (NSDECIMAL_IS_ZERO(r)) if (NSDECIMAL_IS_ZERO(rr))
{ {
result->validNumber = NO; result->validNumber = NO;
return NSCalculationDivideByZero; return NSCalculationDivideByZero;
@ -698,7 +699,7 @@ NSDecimalDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, NSRou
NSDecimalCopy(&n1, l); NSDecimalCopy(&n1, l);
n1.exponent = 0; n1.exponent = 0;
n1.isNegative = NO; n1.isNegative = NO;
NSDecimalCopy(&n2, r); NSDecimalCopy(&n2, rr);
n2.exponent = 0; n2.exponent = 0;
n2.isNegative = NO; n2.isNegative = NO;
@ -733,14 +734,14 @@ NSDecimalDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r, NSRou
} }
NSCalculationError NSCalculationError
NSDecimalPower(NSDecimal *result, const NSDecimal *l, unsigned power, NSRoundingMode mode) NSDecimalPower(NSDecimal *result, const NSDecimal *n, unsigned power, NSRoundingMode mode)
{ {
NSCalculationError error = NSCalculationNoError; NSCalculationError error = NSCalculationNoError;
unsigned int e = power; unsigned int e = power;
NSDecimal n1; NSDecimal n1;
BOOL neg = (l->isNegative && (power % 2)); BOOL neg = (n->isNegative && (power % 2));
NSDecimalCopy(&n1, l); NSDecimalCopy(&n1, n);
n1.isNegative = NO; n1.isNegative = NO;
NSDecimalCopy(result, &one); NSDecimalCopy(result, &one);
// NSDecimalCopy(result, &zero); // NSDecimalCopy(result, &zero);
@ -1242,11 +1243,11 @@ GSSimpleDivide(NSDecimal *result, const NSDecimal *left, const NSDecimal *right,
} }
NSString* NSString*
NSDecimalString(const NSDecimal *number, NSDictionary *locale) NSDecimalString(const NSDecimal *decimal, NSDictionary *locale)
{ {
GSDecimal n; GSDecimal n;
DecimalToCharvec(number, &n); DecimalToCharvec(decimal, &n);
return GSDecimalString(&n, locale); return GSDecimalString(&n, locale);
} }
@ -1599,9 +1600,9 @@ GSSimpleDivide(NSDecimal *result, const NSDecimal *l, const NSDecimal *r,
} }
NSString* 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 // GNUstep extensions to make the implementation of NSDecimalNumber totaly

View file

@ -251,7 +251,7 @@ NSMapTable *
NSCreateMapTableWithZone( NSCreateMapTableWithZone(
NSMapTableKeyCallBacks keyCallBacks, NSMapTableKeyCallBacks keyCallBacks,
NSMapTableValueCallBacks valueCallBacks, NSMapTableValueCallBacks valueCallBacks,
unsigned capacity, unsigned int capacity,
NSZone *zone) NSZone *zone)
{ {
GSIMapTable table; GSIMapTable table;

View file

@ -119,13 +119,13 @@ GSInstanceVariableInfo(id obj, NSString *iVarName,
} }
BOOL BOOL
GSGetInstanceVariable(id obj, NSString *iVarName, void *data) GSGetInstanceVariable(id obj, NSString *name, void *data)
{ {
int offset; int offset;
const char *type; const char *type;
unsigned int size; unsigned int size;
if (GSInstanceVariableInfo(obj, iVarName, &type, &size, &offset) == NO) if (GSInstanceVariableInfo(obj, name, &type, &size, &offset) == NO)
{ {
return NO; return NO;
} }
@ -136,13 +136,13 @@ GSGetInstanceVariable(id obj, NSString *iVarName, void *data)
} }
BOOL BOOL
GSSetInstanceVariable(id obj, NSString *iVarName, const void *data) GSSetInstanceVariable(id obj, NSString *name, const void *data)
{ {
int offset; int offset;
const char *type; const char *type;
unsigned int size; unsigned int size;
if (GSInstanceVariableInfo(obj, iVarName, &type, &size, &offset) == NO) if (GSInstanceVariableInfo(obj, name, &type, &size, &offset) == NO)
{ {
return NO; return NO;
} }

View file

@ -627,9 +627,9 @@ int main(int argc, char *argv[], char *env[])
[self hostName], pid, [NSDate date]]; [self hostName], pid, [NSDate date]];
} }
/************************************************************************* /**
*** Specifying a Process Name * Change the name of the current process to newName.
*************************************************************************/ */
- (void) setProcessName: (NSString *)newName - (void) setProcessName: (NSString *)newName
{ {
if (newName && [newName length]) { if (newName && [newName length]) {
@ -641,10 +641,11 @@ int main(int argc, char *argv[], char *env[])
@end @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 IMP debugImp = 0;
static SEL debugSel; static SEL debugSel;
@ -658,8 +659,10 @@ BOOL GSDebugSet(NSString *val)
} }
debugImp = [_debug_set methodForSelector: debugSel]; debugImp = [_debug_set methodForSelector: debugSel];
} }
if ((*debugImp)(_debug_set, debugSel, val) == nil) if ((*debugImp)(_debug_set, debugSel, level) == nil)
return NO; {
return NO;
}
return YES; return YES;
} }

View file

@ -63,13 +63,13 @@ setupCache()
} }
NSRange NSRange
NSRangeFromString(NSString* string) NSRangeFromString(NSString *aString)
{ {
NSScanner *scanner; NSScanner *scanner;
NSRange range; NSRange range;
setupCache(); setupCache();
scanner = (*scannerImp)(NSScannerClass, scannerSel, string); scanner = (*scannerImp)(NSScannerClass, scannerSel, aString);
if ((*scanStringImp)(scanner, scanStringSel, @"{", NULL) if ((*scanStringImp)(scanner, scanStringSel, @"{", NULL)
&& (*scanStringImp)(scanner, scanStringSel, @"location", NULL) && (*scanStringImp)(scanner, scanStringSel, @"location", NULL)
&& (*scanStringImp)(scanner, scanStringSel, @"=", NULL) && (*scanStringImp)(scanner, scanStringSel, @"=", NULL)