gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidy memory allocation for empty strings.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@4507 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
richard 1999-07-02 13:26:37 +00:00
parent a712b04807
commit 601742f5f9
4 changed files with 323 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

127
Source/NSGString.m
View file

@ -162,13 +162,14 @@
length: (unsigned int)length
fromZone: (NSZone*)zone
{
self = [super init];
if (self) {
_count = length;
_contents_chars = chars;
_zone = chars ? zone : 0;
self = [super init];
if (self)
{
_count = length;
_contents_chars = chars;
_zone = chars ? zone : 0;
}
return self;
return self;
}
/* This is the OpenStep designated initializer for this class. */
@ -176,29 +177,40 @@
length: (unsigned int)length
freeWhenDone: (BOOL)flag
{
self = [super init];
if (self) {
_count = length;
_contents_chars = chars;
if (flag) {
_zone = NSZoneFromPointer(chars);
self = [super init];
if (self)
{
_count = length;
_contents_chars = chars;
if (flag && chars)
{
_zone = NSZoneFromPointer(chars);
}
else {
_zone = 0;
else
{
_zone = 0;
}
}
return self;
return self;
}
- (id) initWithCharacters: (const unichar*)chars
length: (unsigned int)length
{
NSZone *z = fastZone(self);
unichar *s = NSZoneMalloc(z, length*sizeof(unichar));
NSZone *z = fastZone(self);
unichar *s;
if (chars)
if (length)
{
s = NSZoneMalloc(z, length*sizeof(unichar));
if (chars)
memcpy(s, chars, sizeof(unichar)*length);
return [self initWithCharactersNoCopy:s length:length fromZone:z];
}
else
{
s = 0;
}
return [self initWithCharactersNoCopy:s length:length fromZone:z];
}
- (id) initWithCStringNoCopy: (char*)byteString
@ -304,7 +316,7 @@
/* NSCoding Protocol */
- (void) encodeWithCoder: aCoder
- (void) encodeWithCoder: (NSCoder*)aCoder
{
[aCoder encodeValueOfObjCType: @encode(unsigned) at: &_count];
if (_count > 0)
@ -315,7 +327,7 @@
}
}
- initWithCoder: aCoder
- (id) initWithCoder: (NSCoder*)aCoder
{
[aCoder decodeValueOfObjCType: @encode(unsigned) at: &_count];
if (_count)
@ -467,14 +479,14 @@
// @protocol NSMutableString <NSString>
+ allocWithZone: (NSZone*)z
+ (id) allocWithZone: (NSZone*)z
{
return NSAllocateObject (self, 0, z);
return NSAllocateObject(self, 0, z);
}
+ alloc
+ (id) alloc
{
return NSAllocateObject (self, 0, NSDefaultMallocZone());
return NSAllocateObject(self, 0, NSDefaultMallocZone());
}
+ (void) initialize
@ -540,47 +552,54 @@ stringDecrementCountAndFillHoleAt(NSGMutableStringStruct *self,
length: (unsigned int)length
fromZone: (NSZone*)zone
{
self = [super init];
if (self) {
_count = length;
_capacity = length;
_contents_chars = chars;
_zone = zone;
self = [super init];
if (self)
{
_count = length;
_capacity = length;
_contents_chars = chars;
_zone = zone;
}
return self;
return self;
}
- (id) initWithCharactersNoCopy: (unichar*)chars
length: (unsigned int)length
freeWhenDone: (BOOL)flag
{
self = [super init];
if (self) {
_count = length;
_capacity = length;
_contents_chars = chars;
if (flag) {
_zone = NSZoneFromPointer(chars);
self = [super init];
if (self)
{
_count = length;
_capacity = length;
_contents_chars = chars;
if (flag && chars)
{
_zone = NSZoneFromPointer(chars);
}
else {
_zone = 0;
else
{
_zone = 0;
}
}
return self;
return self;
}
- initWithCapacity: (unsigned)capacity
- (id) initWithCapacity: (unsigned)capacity
{
self = [super init];
if (self) {
if (capacity < 2)
capacity = 2;
_count = 0;
_capacity = capacity;
_zone = fastZone(self);
_contents_chars = NSZoneMalloc(_zone, sizeof(unichar)*capacity);
self = [super init];
if (self)
{
if (capacity < 2)
{
capacity = 2;
}
_count = 0;
_capacity = capacity;
_zone = fastZone(self);
_contents_chars = NSZoneMalloc(_zone, sizeof(unichar)*capacity);
}
return self;
return self;
}
- (id) initWithCStringNoCopy: (char*)byteString
@ -612,7 +631,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableStringStruct *self,
}
- (void) replaceCharactersInRange: (NSRange)aRange
withString: (NSString*)aString
withString: (NSString*)aString
{
int offset;
unsigned stringLength;
@ -683,7 +702,7 @@ stringDecrementCountAndFillHoleAt(NSGMutableStringStruct *self,
range.location, range.length);
}
- initWithCoder: aCoder // *** changed to unichar
- (id) initWithCoder: (NSCoder*)aCoder
{
unsigned cap;