From ce0324658ca1a0e12cd14062e3fe12ef47213225 Mon Sep 17 00:00:00 2001 From: richard Date: Sun, 9 Jan 2000 15:30:11 +0000 Subject: [PATCH] attributed string fix git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@5715 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 5 +++++ Source/NSFileManager.m | 8 ++++---- Source/NSGAttributedString.m | 3 ++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01a9863ad..56c171ac4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jan 9 15:20:00 1999 Richard Frith-Macdonald + + * Source/NSGAttributedString.m: ([-attributesAtIndex:effectiveRange:]) + fixed illegal parameter - reported by jagapen@whitewater.chem.wisc.edu + Wed Jan 5 16:22:00 1999 Richard Frith-Macdonald * Source/NSData.m: when serializing selectors, cope with untyped diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m index df5d7de43..1eb7d0c9e 100644 --- a/Source/NSFileManager.m +++ b/Source/NSFileManager.m @@ -1061,10 +1061,10 @@ static NSFileManager* defaultManager = nil; content = [NSMutableArray arrayWithCapacity: 128]; nxtImp = [direnum methodForSelector: @selector(nextObject)]; - addImp = [content methodForSelector: @selector(addObject: )]; + addImp = [content methodForSelector: @selector(addObject:)]; while ((path = (*nxtImp)(direnum, @selector(nextObject))) != nil) - (*addImp)(content, @selector(addObject: ), path); + (*addImp)(content, @selector(addObject:), path); RELEASE(direnum); @@ -1099,10 +1099,10 @@ static NSFileManager* defaultManager = nil; content = [NSMutableArray arrayWithCapacity: 128]; nxtImp = [direnum methodForSelector: @selector(nextObject)]; - addImp = [content methodForSelector: @selector(addObject: )]; + addImp = [content methodForSelector: @selector(addObject:)]; while ((path = (*nxtImp)(direnum, @selector(nextObject))) != nil) - (*addImp)(content, @selector(addObject: ), path); + (*addImp)(content, @selector(addObject:), path); RELEASE(direnum); diff --git a/Source/NSGAttributedString.m b/Source/NSGAttributedString.m index a0c96d7c4..74da49b85 100644 --- a/Source/NSGAttributedString.m +++ b/Source/NSGAttributedString.m @@ -409,8 +409,9 @@ _attributesAtIndexEffectiveRange( - (NSDictionary*) attributesAtIndex: (unsigned)index effectiveRange: (NSRange*)aRange { + unsigned dummy; return _attributesAtIndexEffectiveRange( - index, aRange, [_textChars length], _infoArray, NULL); + index, aRange, [_textChars length], _infoArray, &dummy); } - (void) setAttributes: (NSDictionary*)attributes