Tidied coding.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@3097 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1998-10-21 14:02:33 +00:00
parent 9ac1288542
commit c59a49794b
2 changed files with 15 additions and 34 deletions

View file

@ -34,6 +34,7 @@
#include <Foundation/NSString.h>
#include <Foundation/NSGString.h>
#include <Foundation/NSData.h>
#include <Foundation/NSCoder.h>
#include <gnustep/base/IndexedCollection.h>
#include <gnustep/base/IndexedCollectionPrivate.h>
#include <Foundation/NSValue.h>
@ -254,24 +255,20 @@
- (void) encodeWithCoder: aCoder
{
[aCoder encodeValueOfObjCType:@encode(int) at:&_count
withName:@"Concrete String count"];
[aCoder encodeValueOfObjCType:@encode(int) at:&_count];
[aCoder encodeArrayOfObjCType:@encode(unichar)
count:_count
at:_contents_chars
withName:@"Concrete String content_chars"];
at:_contents_chars];
}
- initWithCoder: aCoder
{
[aCoder decodeValueOfObjCType:@encode(int) at:&_count
withName:NULL];
[aCoder decodeValueOfObjCType:@encode(int) at:&_count];
_zone = fastZone(self);
_contents_chars = NSZoneMalloc(_zone, sizeof(unichar)*_count);
[aCoder decodeArrayOfObjCType:@encode(unichar)
count:_count
at:_contents_chars
withName:NULL];
at:_contents_chars];
return self;
}
@ -533,28 +530,23 @@ stringDecrementCountAndFillHoleAt(NSGMutableStringStruct *self,
- (void) encodeWithCoder: aCoder // *** changed to unichar
{
[aCoder encodeValueOfObjCType:@encode(unsigned) at:&_capacity
withName:@"String capacity"];
[aCoder encodeValueOfObjCType:@encode(int) at:&_count
withName:@"Concrete String count"];
[aCoder encodeValueOfObjCType:@encode(unsigned) at:&_capacity];
[aCoder encodeValueOfObjCType:@encode(int) at:&_count];
[aCoder encodeArrayOfObjCType:@encode(unichar)
count:_count
at:_contents_chars
withName:@"Concrete String content_chars"];
at:_contents_chars];
}
- initWithCoder: aCoder // *** changed to unichar
{
unsigned cap;
[aCoder decodeValueOfObjCType:@encode(unsigned) at:&cap withName:NULL];
[aCoder decodeValueOfObjCType:@encode(unsigned) at:&cap];
[self initWithCapacity:cap];
[aCoder decodeValueOfObjCType:@encode(int) at:&_count
withName:NULL];
[aCoder decodeValueOfObjCType:@encode(int) at:&_count];
[aCoder decodeArrayOfObjCType:@encode(unichar)
count:_count
at:_contents_chars
withName:NULL];
at:_contents_chars];
return self;
}